diff --git a/examples/blend-modes.js b/examples/blend-modes.js
index f5b736dd19..d6fbc7909c 100644
--- a/examples/blend-modes.js
+++ b/examples/blend-modes.js
@@ -2,7 +2,7 @@ import Feature from '../src/ol/Feature.js';
 import Map from '../src/ol/Map.js';
 import View from '../src/ol/View.js';
 import Point from '../src/ol/geom/Point.js';
-import _ol_layer_Vector_ from '../src/ol/layer/Vector.js';
+import VectorLayer from '../src/ol/layer/Vector.js';
 import _ol_source_Vector_ 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_Style_ from '../src/ol/style/Style.js';
 //
 // Every layer has one feature that is styled with a circle, together the
 // features form the corners of an equilateral triangle and their styles overlap
-var redLayer = new _ol_layer_Vector_({
+var redLayer = new VectorLayer({
   source: new _ol_source_Vector_({
     features: [new Feature(new Point([0, 0]))]
   }),
@@ -31,7 +31,7 @@ var redLayer = new _ol_layer_Vector_({
     })
   })
 });
-var greenLayer = new _ol_layer_Vector_({
+var greenLayer = new VectorLayer({
   source: new _ol_source_Vector_({
     // 433.013 is roughly 250 * Math.sqrt(3)
     features: [new Feature(new Point([250, 433.013]))]
@@ -49,7 +49,7 @@ var greenLayer = new _ol_layer_Vector_({
     })
   })
 });
-var blueLayer = new _ol_layer_Vector_({
+var blueLayer = new VectorLayer({
   source: new _ol_source_Vector_({
     features: [new Feature(new Point([500, 0]))]
   }),
diff --git a/examples/box-selection.js b/examples/box-selection.js
index 6c60c3886a..4d5d08b962 100644
--- a/examples/box-selection.js
+++ b/examples/box-selection.js
@@ -5,7 +5,7 @@ import GeoJSON from '../src/ol/format/GeoJSON.js';
 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 _ol_layer_Vector_ from '../src/ol/layer/Vector.js';
+import VectorLayer from '../src/ol/layer/Vector.js';
 import _ol_source_OSM_ from '../src/ol/source/OSM.js';
 import _ol_source_Vector_ from '../src/ol/source/Vector.js';
 
@@ -21,7 +21,7 @@ var map = new Map({
     new TileLayer({
       source: new _ol_source_OSM_()
     }),
-    new _ol_layer_Vector_({
+    new VectorLayer({
       source: vectorSource
     })
   ],
diff --git a/examples/canvas-gradient-pattern.js b/examples/canvas-gradient-pattern.js
index db9122fd18..f4299b64aa 100644
--- a/examples/canvas-gradient-pattern.js
+++ b/examples/canvas-gradient-pattern.js
@@ -3,7 +3,7 @@ import View from '../src/ol/View.js';
 import * as _ol_extent_ from '../src/ol/extent.js';
 import GeoJSON from '../src/ol/format/GeoJSON.js';
 import _ol_has_ from '../src/ol/has.js';
-import _ol_layer_Vector_ from '../src/ol/layer/Vector.js';
+import VectorLayer from '../src/ol/layer/Vector.js';
 import {fromLonLat} from '../src/ol/proj.js';
 import _ol_source_Vector_ from '../src/ol/source/Vector.js';
 import _ol_style_Fill_ from '../src/ol/style/Fill.js';
@@ -81,7 +81,7 @@ var getStackedStyle = function(feature, resolution) {
 };
 
 // Create a vector layer that makes use of the style function above…
-var vectorLayer = new _ol_layer_Vector_({
+var vectorLayer = new VectorLayer({
   source: new _ol_source_Vector_({
     url: 'data/geojson/countries.geojson',
     format: new GeoJSON()
diff --git a/examples/center.js b/examples/center.js
index 44fa61e3d0..2c31999ecb 100644
--- a/examples/center.js
+++ b/examples/center.js
@@ -3,7 +3,7 @@ import View from '../src/ol/View.js';
 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 _ol_layer_Vector_ from '../src/ol/layer/Vector.js';
+import VectorLayer from '../src/ol/layer/Vector.js';
 import _ol_source_OSM_ from '../src/ol/source/OSM.js';
 import _ol_source_Vector_ from '../src/ol/source/Vector.js';
 import _ol_style_Circle_ from '../src/ol/style/Circle.js';
@@ -34,7 +34,7 @@ var style = new _ol_style_Style_({
     })
   })
 });
-var vectorLayer = new _ol_layer_Vector_({
+var vectorLayer = new VectorLayer({
   source: source,
   style: style
 });
diff --git a/examples/cluster.js b/examples/cluster.js
index dc017c1ee7..c0246aab4a 100644
--- a/examples/cluster.js
+++ b/examples/cluster.js
@@ -3,7 +3,7 @@ import Map from '../src/ol/Map.js';
 import View from '../src/ol/View.js';
 import Point from '../src/ol/geom/Point.js';
 import TileLayer from '../src/ol/layer/Tile.js';
-import _ol_layer_Vector_ from '../src/ol/layer/Vector.js';
+import VectorLayer from '../src/ol/layer/Vector.js';
 import _ol_source_Cluster_ from '../src/ol/source/Cluster.js';
 import _ol_source_OSM_ from '../src/ol/source/OSM.js';
 import _ol_source_Vector_ from '../src/ol/source/Vector.js';
@@ -34,7 +34,7 @@ var clusterSource = new _ol_source_Cluster_({
 });
 
 var styleCache = {};
-var clusters = new _ol_layer_Vector_({
+var clusters = new VectorLayer({
   source: clusterSource,
   style: function(feature) {
     var size = feature.get('features').length;
diff --git a/examples/custom-interactions.js b/examples/custom-interactions.js
index fec48f2ed9..3f0e936ef3 100644
--- a/examples/custom-interactions.js
+++ b/examples/custom-interactions.js
@@ -8,7 +8,7 @@ import Polygon from '../src/ol/geom/Polygon.js';
 import {defaults as defaultInteractions} from '../src/ol/interaction.js';
 import _ol_interaction_Pointer_ from '../src/ol/interaction/Pointer.js';
 import TileLayer from '../src/ol/layer/Tile.js';
-import _ol_layer_Vector_ from '../src/ol/layer/Vector.js';
+import VectorLayer from '../src/ol/layer/Vector.js';
 import _ol_source_TileJSON_ from '../src/ol/source/TileJSON.js';
 import _ol_source_Vector_ from '../src/ol/source/Vector.js';
 import _ol_style_Fill_ from '../src/ol/style/Fill.js';
@@ -152,7 +152,7 @@ var map = new Map({
         url: 'https://api.tiles.mapbox.com/v3/mapbox.geography-class.json?secure'
       })
     }),
-    new _ol_layer_Vector_({
+    new VectorLayer({
       source: new _ol_source_Vector_({
         features: [pointFeature, lineFeature, polygonFeature]
       }),
diff --git a/examples/drag-and-drop-image-vector.js b/examples/drag-and-drop-image-vector.js
index c1d08a6159..2a40755dea 100644
--- a/examples/drag-and-drop-image-vector.js
+++ b/examples/drag-and-drop-image-vector.js
@@ -7,7 +7,7 @@ import KML from '../src/ol/format/KML.js';
 import TopoJSON from '../src/ol/format/TopoJSON.js';
 import {defaults as defaultInteractions} from '../src/ol/interaction.js';
 import DragAndDrop from '../src/ol/interaction/DragAndDrop.js';
-import _ol_layer_Vector_ from '../src/ol/layer/Vector.js';
+import VectorLayer from '../src/ol/layer/Vector.js';
 import TileLayer from '../src/ol/layer/Tile.js';
 import _ol_source_BingMaps_ from '../src/ol/source/BingMaps.js';
 import _ol_source_Vector_ from '../src/ol/source/Vector.js';
@@ -114,7 +114,7 @@ dragAndDropInteraction.on('addfeatures', function(event) {
   var vectorSource = new _ol_source_Vector_({
     features: event.features
   });
-  map.addLayer(new _ol_layer_Vector_({
+  map.addLayer(new VectorLayer({
     renderMode: 'image',
     source: vectorSource,
     style: styleFunction
diff --git a/examples/drag-and-drop.js b/examples/drag-and-drop.js
index 5826085c92..9cf67a93db 100644
--- a/examples/drag-and-drop.js
+++ b/examples/drag-and-drop.js
@@ -8,7 +8,7 @@ import TopoJSON from '../src/ol/format/TopoJSON.js';
 import {defaults as defaultInteractions} from '../src/ol/interaction.js';
 import DragAndDrop from '../src/ol/interaction/DragAndDrop.js';
 import TileLayer from '../src/ol/layer/Tile.js';
-import _ol_layer_Vector_ from '../src/ol/layer/Vector.js';
+import VectorLayer from '../src/ol/layer/Vector.js';
 import _ol_source_BingMaps_ from '../src/ol/source/BingMaps.js';
 import _ol_source_Vector_ from '../src/ol/source/Vector.js';
 import _ol_style_Circle_ from '../src/ol/style/Circle.js';
@@ -114,7 +114,7 @@ dragAndDropInteraction.on('addfeatures', function(event) {
   var vectorSource = new _ol_source_Vector_({
     features: event.features
   });
-  map.addLayer(new _ol_layer_Vector_({
+  map.addLayer(new VectorLayer({
     source: vectorSource,
     style: styleFunction
   }));
diff --git a/examples/draw-and-modify-features.js b/examples/draw-and-modify-features.js
index 096540c6e6..8e206e170c 100644
--- a/examples/draw-and-modify-features.js
+++ b/examples/draw-and-modify-features.js
@@ -4,7 +4,7 @@ import Draw from '../src/ol/interaction/Draw.js';
 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 _ol_layer_Vector_ from '../src/ol/layer/Vector.js';
+import VectorLayer from '../src/ol/layer/Vector.js';
 import _ol_source_OSM_ from '../src/ol/source/OSM.js';
 import _ol_source_Vector_ from '../src/ol/source/Vector.js';
 import _ol_style_Circle_ from '../src/ol/style/Circle.js';
@@ -17,7 +17,7 @@ var raster = new TileLayer({
 });
 
 var source = new _ol_source_Vector_();
-var vector = new _ol_layer_Vector_({
+var vector = new VectorLayer({
   source: source,
   style: new _ol_style_Style_({
     fill: new _ol_style_Fill_({
diff --git a/examples/draw-features.js b/examples/draw-features.js
index a58dbb1feb..8856cb38c9 100644
--- a/examples/draw-features.js
+++ b/examples/draw-features.js
@@ -2,7 +2,7 @@ import Map from '../src/ol/Map.js';
 import View from '../src/ol/View.js';
 import Draw from '../src/ol/interaction/Draw.js';
 import TileLayer from '../src/ol/layer/Tile.js';
-import _ol_layer_Vector_ from '../src/ol/layer/Vector.js';
+import VectorLayer from '../src/ol/layer/Vector.js';
 import _ol_source_OSM_ from '../src/ol/source/OSM.js';
 import _ol_source_Vector_ from '../src/ol/source/Vector.js';
 
@@ -12,7 +12,7 @@ var raster = new TileLayer({
 
 var source = new _ol_source_Vector_({wrapX: false});
 
-var vector = new _ol_layer_Vector_({
+var vector = new VectorLayer({
   source: source
 });
 
diff --git a/examples/draw-freehand.js b/examples/draw-freehand.js
index 55e763386c..493dd87050 100644
--- a/examples/draw-freehand.js
+++ b/examples/draw-freehand.js
@@ -2,7 +2,7 @@ import Map from '../src/ol/Map.js';
 import View from '../src/ol/View.js';
 import Draw from '../src/ol/interaction/Draw.js';
 import TileLayer from '../src/ol/layer/Tile.js';
-import _ol_layer_Vector_ from '../src/ol/layer/Vector.js';
+import VectorLayer from '../src/ol/layer/Vector.js';
 import _ol_source_OSM_ from '../src/ol/source/OSM.js';
 import _ol_source_Vector_ from '../src/ol/source/Vector.js';
 
@@ -12,7 +12,7 @@ var raster = new TileLayer({
 
 var source = new _ol_source_Vector_({wrapX: false});
 
-var vector = new _ol_layer_Vector_({
+var vector = new VectorLayer({
   source: source
 });
 
diff --git a/examples/draw-shapes.js b/examples/draw-shapes.js
index 1cd126a1cf..8f38e044fc 100644
--- a/examples/draw-shapes.js
+++ b/examples/draw-shapes.js
@@ -3,7 +3,7 @@ import View from '../src/ol/View.js';
 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 _ol_layer_Vector_ from '../src/ol/layer/Vector.js';
+import VectorLayer from '../src/ol/layer/Vector.js';
 import _ol_source_OSM_ from '../src/ol/source/OSM.js';
 import _ol_source_Vector_ from '../src/ol/source/Vector.js';
 
@@ -13,7 +13,7 @@ var raster = new TileLayer({
 
 var source = new _ol_source_Vector_({wrapX: false});
 
-var vector = new _ol_layer_Vector_({
+var vector = new VectorLayer({
   source: source
 });
 
diff --git a/examples/earthquake-clusters.js b/examples/earthquake-clusters.js
index c74d2adcdf..cf6d36a9c8 100644
--- a/examples/earthquake-clusters.js
+++ b/examples/earthquake-clusters.js
@@ -5,7 +5,7 @@ import KML from '../src/ol/format/KML.js';
 import {defaults as defaultInteractions} from '../src/ol/interaction.js';
 import _ol_interaction_Select_ from '../src/ol/interaction/Select.js';
 import TileLayer from '../src/ol/layer/Tile.js';
-import _ol_layer_Vector_ from '../src/ol/layer/Vector.js';
+import VectorLayer from '../src/ol/layer/Vector.js';
 import _ol_source_Cluster_ from '../src/ol/source/Cluster.js';
 import _ol_source_Stamen_ from '../src/ol/source/Stamen.js';
 import _ol_source_Vector_ from '../src/ol/source/Vector.js';
@@ -121,7 +121,7 @@ function selectStyleFunction(feature) {
   return styles;
 }
 
-vector = new _ol_layer_Vector_({
+vector = new VectorLayer({
   source: new _ol_source_Cluster_({
     distance: 40,
     source: new _ol_source_Vector_({
diff --git a/examples/earthquake-custom-symbol.js b/examples/earthquake-custom-symbol.js
index 4309055d07..c5576b272c 100644
--- a/examples/earthquake-custom-symbol.js
+++ b/examples/earthquake-custom-symbol.js
@@ -3,7 +3,7 @@ import View from '../src/ol/View.js';
 import KML from '../src/ol/format/KML.js';
 import Polygon from '../src/ol/geom/Polygon.js';
 import TileLayer from '../src/ol/layer/Tile.js';
-import _ol_layer_Vector_ from '../src/ol/layer/Vector.js';
+import VectorLayer from '../src/ol/layer/Vector.js';
 import _ol_render_ from '../src/ol/render.js';
 import _ol_source_Stamen_ from '../src/ol/source/Stamen.js';
 import _ol_source_Vector_ from '../src/ol/source/Vector.js';
@@ -52,7 +52,7 @@ var styleFunction = function(feature) {
   return style;
 };
 
-var vector = new _ol_layer_Vector_({
+var vector = new VectorLayer({
   source: new _ol_source_Vector_({
     url: 'data/kml/2012_Earthquakes_Mag5.kml',
     format: new KML({
diff --git a/examples/export-map.js b/examples/export-map.js
index c7f605352f..080f7318f2 100644
--- a/examples/export-map.js
+++ b/examples/export-map.js
@@ -5,7 +5,7 @@ import View from '../src/ol/View.js';
 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 _ol_layer_Vector_ from '../src/ol/layer/Vector.js';
+import VectorLayer from '../src/ol/layer/Vector.js';
 import _ol_source_OSM_ from '../src/ol/source/OSM.js';
 import _ol_source_Vector_ from '../src/ol/source/Vector.js';
 
@@ -14,7 +14,7 @@ var map = new Map({
     new TileLayer({
       source: new _ol_source_OSM_()
     }),
-    new _ol_layer_Vector_({
+    new VectorLayer({
       source: new _ol_source_Vector_({
         url: 'data/geojson/countries.geojson',
         format: new GeoJSON()
diff --git a/examples/export-pdf.js b/examples/export-pdf.js
index 49a24b5c90..4faedddee2 100644
--- a/examples/export-pdf.js
+++ b/examples/export-pdf.js
@@ -4,7 +4,7 @@ import View from '../src/ol/View.js';
 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 _ol_layer_Vector_ from '../src/ol/layer/Vector.js';
+import VectorLayer from '../src/ol/layer/Vector.js';
 import _ol_source_OSM_ from '../src/ol/source/OSM.js';
 import _ol_source_Vector_ from '../src/ol/source/Vector.js';
 
@@ -19,7 +19,7 @@ var feature = format.readFeature(
         '-39.1552734375, 10.689697265625 -25.0927734375))');
 feature.getGeometry().transform('EPSG:4326', 'EPSG:3857');
 
-var vector = new _ol_layer_Vector_({
+var vector = new VectorLayer({
   source: new _ol_source_Vector_({
     features: [feature]
   })
diff --git a/examples/extent-interaction.js b/examples/extent-interaction.js
index 06b3348066..52f056abd9 100644
--- a/examples/extent-interaction.js
+++ b/examples/extent-interaction.js
@@ -4,7 +4,7 @@ import _ol_events_condition_ from '../src/ol/events/condition.js';
 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 _ol_layer_Vector_ from '../src/ol/layer/Vector.js';
+import VectorLayer from '../src/ol/layer/Vector.js';
 import _ol_source_OSM_ from '../src/ol/source/OSM.js';
 import _ol_source_Vector_ from '../src/ol/source/Vector.js';
 
@@ -18,7 +18,7 @@ var map = new Map({
     new TileLayer({
       source: new _ol_source_OSM_()
     }),
-    new _ol_layer_Vector_({
+    new VectorLayer({
       source: vectorSource
     })
   ],
diff --git a/examples/feature-animation.js b/examples/feature-animation.js
index 17b4dab7a3..18794dd397 100644
--- a/examples/feature-animation.js
+++ b/examples/feature-animation.js
@@ -6,7 +6,7 @@ import {defaults as defaultControls} from '../src/ol/control.js';
 import {easeOut} from '../src/ol/easing.js';
 import Point from '../src/ol/geom/Point.js';
 import TileLayer from '../src/ol/layer/Tile.js';
-import _ol_layer_Vector_ from '../src/ol/layer/Vector.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 _ol_source_Vector_ from '../src/ol/source/Vector.js';
@@ -38,7 +38,7 @@ var map = new Map({
 var source = new _ol_source_Vector_({
   wrapX: false
 });
-var vector = new _ol_layer_Vector_({
+var vector = new VectorLayer({
   source: source
 });
 map.addLayer(vector);
diff --git a/examples/feature-move-animation.js b/examples/feature-move-animation.js
index 5c5a65f7ad..53fa7a1b76 100644
--- a/examples/feature-move-animation.js
+++ b/examples/feature-move-animation.js
@@ -4,7 +4,7 @@ import View from '../src/ol/View.js';
 import Polyline from '../src/ol/format/Polyline.js';
 import Point from '../src/ol/geom/Point.js';
 import TileLayer from '../src/ol/layer/Tile.js';
-import _ol_layer_Vector_ from '../src/ol/layer/Vector.js';
+import VectorLayer from '../src/ol/layer/Vector.js';
 import _ol_source_BingMaps_ from '../src/ol/source/BingMaps.js';
 import _ol_source_Vector_ from '../src/ol/source/Vector.js';
 import _ol_style_Circle_ from '../src/ol/style/Circle.js';
@@ -113,7 +113,7 @@ var speed, now;
 var speedInput = document.getElementById('speed');
 var startButton = document.getElementById('start-animation');
 
-var vectorLayer = new _ol_layer_Vector_({
+var vectorLayer = new VectorLayer({
   source: new _ol_source_Vector_({
     features: [routeFeature, geoMarker, startMarker, endMarker]
   }),
diff --git a/examples/flight-animation.js b/examples/flight-animation.js
index dab7af7b6a..ecf5fb3e87 100644
--- a/examples/flight-animation.js
+++ b/examples/flight-animation.js
@@ -4,7 +4,7 @@ import Map from '../src/ol/Map.js';
 import View from '../src/ol/View.js';
 import LineString from '../src/ol/geom/LineString.js';
 import TileLayer from '../src/ol/layer/Tile.js';
-import _ol_layer_Vector_ from '../src/ol/layer/Vector.js';
+import VectorLayer from '../src/ol/layer/Vector.js';
 import _ol_source_Stamen_ from '../src/ol/source/Stamen.js';
 import _ol_source_Vector_ from '../src/ol/source/Vector.js';
 import _ol_style_Stroke_ from '../src/ol/style/Stroke.js';
@@ -109,7 +109,7 @@ flightsSource = new _ol_source_Vector_({
   }
 });
 
-var flightsLayer = new _ol_layer_Vector_({
+var flightsLayer = new VectorLayer({
   source: flightsSource,
   style: function(feature) {
     // if the animation is still active for a feature, do not
diff --git a/examples/fractal.js b/examples/fractal.js
index bd1a20ee33..27807cef7f 100644
--- a/examples/fractal.js
+++ b/examples/fractal.js
@@ -2,7 +2,7 @@ import Feature from '../src/ol/Feature.js';
 import Map from '../src/ol/Map.js';
 import View from '../src/ol/View.js';
 import LineString from '../src/ol/geom/LineString.js';
-import _ol_layer_Vector_ from '../src/ol/layer/Vector.js';
+import VectorLayer from '../src/ol/layer/Vector.js';
 import _ol_source_Vector_ from '../src/ol/source/Vector.js';
 
 var radius = 10e6;
@@ -17,7 +17,7 @@ var triangle = new LineString([
 
 var feature = new Feature(triangle);
 
-var layer = new _ol_layer_Vector_({
+var layer = new VectorLayer({
   source: new _ol_source_Vector_({
     features: [feature]
   })
diff --git a/examples/geojson.js b/examples/geojson.js
index 0d1000934e..291173b645 100644
--- a/examples/geojson.js
+++ b/examples/geojson.js
@@ -5,7 +5,7 @@ import {defaults as defaultControls} from '../src/ol/control.js';
 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 _ol_layer_Vector_ from '../src/ol/layer/Vector.js';
+import VectorLayer from '../src/ol/layer/Vector.js';
 import _ol_source_OSM_ from '../src/ol/source/OSM.js';
 import _ol_source_Vector_ from '../src/ol/source/Vector.js';
 import _ol_style_Circle_ from '../src/ol/style/Circle.js';
@@ -166,7 +166,7 @@ var vectorSource = new _ol_source_Vector_({
 
 vectorSource.addFeature(new Feature(new Circle([5e6, 7e6], 1e6)));
 
-var vectorLayer = new _ol_layer_Vector_({
+var vectorLayer = new VectorLayer({
   source: vectorSource,
   style: styleFunction
 });
diff --git a/examples/geolocation.js b/examples/geolocation.js
index 68ef9bccb6..42f9cb045d 100644
--- a/examples/geolocation.js
+++ b/examples/geolocation.js
@@ -5,7 +5,7 @@ import View from '../src/ol/View.js';
 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 _ol_layer_Vector_ from '../src/ol/layer/Vector.js';
+import VectorLayer from '../src/ol/layer/Vector.js';
 import _ol_source_OSM_ from '../src/ol/source/OSM.js';
 import _ol_source_Vector_ from '../src/ol/source/Vector.js';
 import _ol_style_Circle_ from '../src/ol/style/Circle.js';
@@ -86,7 +86,7 @@ geolocation.on('change:position', function() {
     new Point(coordinates) : null);
 });
 
-new _ol_layer_Vector_({
+new VectorLayer({
   map: map,
   source: new _ol_source_Vector_({
     features: [accuracyFeature, positionFeature]
diff --git a/examples/gpx.js b/examples/gpx.js
index 9aafbcfa40..8fee6c05b5 100644
--- a/examples/gpx.js
+++ b/examples/gpx.js
@@ -2,7 +2,7 @@ import Map from '../src/ol/Map.js';
 import View from '../src/ol/View.js';
 import GPX from '../src/ol/format/GPX.js';
 import TileLayer from '../src/ol/layer/Tile.js';
-import _ol_layer_Vector_ from '../src/ol/layer/Vector.js';
+import VectorLayer from '../src/ol/layer/Vector.js';
 import _ol_source_BingMaps_ from '../src/ol/source/BingMaps.js';
 import _ol_source_Vector_ from '../src/ol/source/Vector.js';
 import _ol_style_Circle_ from '../src/ol/style/Circle.js';
@@ -44,7 +44,7 @@ var style = {
   })
 };
 
-var vector = new _ol_layer_Vector_({
+var vector = new VectorLayer({
   source: new _ol_source_Vector_({
     url: 'data/gpx/fells_loop.gpx',
     format: new GPX()
diff --git a/examples/hit-tolerance.js b/examples/hit-tolerance.js
index 6d6371bb84..781f31cf94 100644
--- a/examples/hit-tolerance.js
+++ b/examples/hit-tolerance.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_Vector_ from '../src/ol/layer/Vector.js';
+import VectorLayer from '../src/ol/layer/Vector.js';
 import _ol_source_OSM_ from '../src/ol/source/OSM.js';
 import _ol_source_Vector_ from '../src/ol/source/Vector.js';
 import Feature from '../src/ol/Feature.js';
@@ -22,7 +22,7 @@ var style = new _ol_style_Style_({
 
 var feature = new Feature(new LineString([[-4000000, 0], [4000000, 0]]));
 
-var vector = new _ol_layer_Vector_({
+var vector = new VectorLayer({
   source: new _ol_source_Vector_({
     features: [feature]
   }),
diff --git a/examples/icon-color.js b/examples/icon-color.js
index ca341181f5..9f0ab05ac0 100644
--- a/examples/icon-color.js
+++ b/examples/icon-color.js
@@ -3,7 +3,7 @@ import Map from '../src/ol/Map.js';
 import View from '../src/ol/View.js';
 import Point from '../src/ol/geom/Point.js';
 import TileLayer from '../src/ol/layer/Tile.js';
-import _ol_layer_Vector_ from '../src/ol/layer/Vector.js';
+import VectorLayer from '../src/ol/layer/Vector.js';
 import {fromLonLat} from '../src/ol/proj.js';
 import _ol_source_TileJSON_ from '../src/ol/source/TileJSON.js';
 import _ol_source_Vector_ from '../src/ol/source/Vector.js';
@@ -52,7 +52,7 @@ var vectorSource = new _ol_source_Vector_({
   features: [rome, london, madrid]
 });
 
-var vectorLayer = new _ol_layer_Vector_({
+var vectorLayer = new VectorLayer({
   source: vectorSource
 });
 
diff --git a/examples/icon-negative.js b/examples/icon-negative.js
index 75a6dfb5b9..1ad87b9809 100644
--- a/examples/icon-negative.js
+++ b/examples/icon-negative.js
@@ -4,7 +4,7 @@ import View from '../src/ol/View.js';
 import Point from '../src/ol/geom/Point.js';
 import _ol_interaction_Select_ from '../src/ol/interaction/Select.js';
 import TileLayer from '../src/ol/layer/Tile.js';
-import _ol_layer_Vector_ from '../src/ol/layer/Vector.js';
+import VectorLayer from '../src/ol/layer/Vector.js';
 import _ol_source_Stamen_ from '../src/ol/source/Stamen.js';
 import _ol_source_Vector_ from '../src/ol/source/Vector.js';
 import _ol_style_Icon_ from '../src/ol/style/Icon.js';
@@ -31,7 +31,7 @@ var map = new Map({
     new TileLayer({
       source: new _ol_source_Stamen_({layer: 'watercolor'})
     }),
-    new _ol_layer_Vector_({
+    new VectorLayer({
       style: function(feature) {
         return feature.get('style');
       },
diff --git a/examples/icon-sprite-webgl.js b/examples/icon-sprite-webgl.js
index dd1896e480..1df4f84aa3 100644
--- a/examples/icon-sprite-webgl.js
+++ b/examples/icon-sprite-webgl.js
@@ -2,7 +2,7 @@ import Feature from '../src/ol/Feature.js';
 import Map from '../src/ol/Map.js';
 import View from '../src/ol/View.js';
 import Point from '../src/ol/geom/Point.js';
-import _ol_layer_Vector_ from '../src/ol/layer/Vector.js';
+import VectorLayer from '../src/ol/layer/Vector.js';
 import _ol_source_Vector_ from '../src/ol/source/Vector.js';
 import _ol_style_Icon_ from '../src/ol/style/Icon.js';
 import _ol_style_Style_ from '../src/ol/style/Style.js';
@@ -75,7 +75,7 @@ for (i = 0; i < featureCount; ++i) {
 var vectorSource = new _ol_source_Vector_({
   features: features
 });
-var vector = new _ol_layer_Vector_({
+var vector = new VectorLayer({
   source: vectorSource
 });
 
@@ -96,7 +96,7 @@ for (i = 0; i < featureCount; i += 30) {
   overlayFeatures.push(clone);
 }
 
-new _ol_layer_Vector_({
+new VectorLayer({
   map: map,
   source: new _ol_source_Vector_({
     features: overlayFeatures
diff --git a/examples/icon.js b/examples/icon.js
index 1a862f6814..c315f0d251 100644
--- a/examples/icon.js
+++ b/examples/icon.js
@@ -4,7 +4,7 @@ import _ol_Overlay_ from '../src/ol/Overlay.js';
 import View from '../src/ol/View.js';
 import Point from '../src/ol/geom/Point.js';
 import TileLayer from '../src/ol/layer/Tile.js';
-import _ol_layer_Vector_ from '../src/ol/layer/Vector.js';
+import VectorLayer from '../src/ol/layer/Vector.js';
 import _ol_source_TileJSON_ from '../src/ol/source/TileJSON.js';
 import _ol_source_Vector_ from '../src/ol/source/Vector.js';
 import _ol_style_Icon_ from '../src/ol/style/Icon.js';
@@ -33,7 +33,7 @@ var vectorSource = new _ol_source_Vector_({
   features: [iconFeature]
 });
 
-var vectorLayer = new _ol_layer_Vector_({
+var vectorLayer = new VectorLayer({
   source: vectorSource
 });
 
diff --git a/examples/igc.js b/examples/igc.js
index 28adc5c144..33ab1d1cfa 100644
--- a/examples/igc.js
+++ b/examples/igc.js
@@ -6,7 +6,7 @@ import IGC from '../src/ol/format/IGC.js';
 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 _ol_layer_Vector_ from '../src/ol/layer/Vector.js';
+import VectorLayer from '../src/ol/layer/Vector.js';
 import _ol_source_OSM_ from '../src/ol/source/OSM.js';
 import _ol_source_Vector_ from '../src/ol/source/Vector.js';
 import _ol_style_Circle_ from '../src/ol/style/Circle.js';
@@ -92,7 +92,7 @@ var map = new Map({
             '?apikey=0e6fc415256d4fbb9b5166a718591d71'
       })
     }),
-    new _ol_layer_Vector_({
+    new VectorLayer({
       source: vectorSource,
       style: styleFunction
     })
@@ -175,7 +175,7 @@ map.on('postcompose', function(evt) {
   }
 });
 
-var featureOverlay = new _ol_layer_Vector_({
+var featureOverlay = new VectorLayer({
   source: new _ol_source_Vector_(),
   map: map,
   style: new _ol_style_Style_({
diff --git a/examples/image-vector-layer.js b/examples/image-vector-layer.js
index 20224623ba..eecaed1b04 100644
--- a/examples/image-vector-layer.js
+++ b/examples/image-vector-layer.js
@@ -1,7 +1,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_layer_Vector_ from '../src/ol/layer/Vector.js';
+import VectorLayer from '../src/ol/layer/Vector.js';
 import _ol_source_Vector_ from '../src/ol/source/Vector.js';
 import _ol_style_Fill_ from '../src/ol/style/Fill.js';
 import _ol_style_Stroke_ from '../src/ol/style/Stroke.js';
@@ -22,7 +22,7 @@ var style = new _ol_style_Style_({
 
 var map = new Map({
   layers: [
-    new _ol_layer_Vector_({
+    new VectorLayer({
       renderMode: 'image',
       source: new _ol_source_Vector_({
         url: 'data/geojson/countries.geojson',
@@ -41,7 +41,7 @@ var map = new Map({
   })
 });
 
-var featureOverlay = new _ol_layer_Vector_({
+var featureOverlay = new VectorLayer({
   source: new _ol_source_Vector_(),
   map: map,
   style: new _ol_style_Style_({
diff --git a/examples/jsts.js b/examples/jsts.js
index 9ce1eaab48..5a13544bfe 100644
--- a/examples/jsts.js
+++ b/examples/jsts.js
@@ -4,7 +4,7 @@ import Map from '../src/ol/Map.js';
 import View from '../src/ol/View.js';
 import GeoJSON from '../src/ol/format/GeoJSON.js';
 import TileLayer from '../src/ol/layer/Tile.js';
-import _ol_layer_Vector_ from '../src/ol/layer/Vector.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 _ol_source_Vector_ from '../src/ol/source/Vector.js';
@@ -33,7 +33,7 @@ fetch('data/geojson/roads-seoul.geojson').then(function(response) {
 
   source.addFeatures(features);
 });
-var vectorLayer = new _ol_layer_Vector_({
+var vectorLayer = new VectorLayer({
   source: source
 });
 
diff --git a/examples/kml-earthquakes.js b/examples/kml-earthquakes.js
index efcd74a7c7..8f302419e6 100644
--- a/examples/kml-earthquakes.js
+++ b/examples/kml-earthquakes.js
@@ -2,7 +2,7 @@ import Map from '../src/ol/Map.js';
 import View from '../src/ol/View.js';
 import KML from '../src/ol/format/KML.js';
 import TileLayer from '../src/ol/layer/Tile.js';
-import _ol_layer_Vector_ from '../src/ol/layer/Vector.js';
+import VectorLayer from '../src/ol/layer/Vector.js';
 import _ol_source_Stamen_ from '../src/ol/source/Stamen.js';
 import _ol_source_Vector_ from '../src/ol/source/Vector.js';
 import _ol_style_Circle_ from '../src/ol/style/Circle.js';
@@ -38,7 +38,7 @@ var styleFunction = function(feature) {
   return style;
 };
 
-var vector = new _ol_layer_Vector_({
+var vector = new VectorLayer({
   source: new _ol_source_Vector_({
     url: 'data/kml/2012_Earthquakes_Mag5.kml',
     format: new KML({
diff --git a/examples/kml-timezones.js b/examples/kml-timezones.js
index e6c1cbbbf1..10f6ca387c 100644
--- a/examples/kml-timezones.js
+++ b/examples/kml-timezones.js
@@ -2,7 +2,7 @@ import Map from '../src/ol/Map.js';
 import View from '../src/ol/View.js';
 import KML from '../src/ol/format/KML.js';
 import TileLayer from '../src/ol/layer/Tile.js';
-import _ol_layer_Vector_ from '../src/ol/layer/Vector.js';
+import VectorLayer from '../src/ol/layer/Vector.js';
 import _ol_source_Stamen_ from '../src/ol/source/Stamen.js';
 import _ol_source_Vector_ from '../src/ol/source/Vector.js';
 import _ol_style_Fill_ from '../src/ol/style/Fill.js';
@@ -45,7 +45,7 @@ var styleFunction = function(feature) {
   });
 };
 
-var vector = new _ol_layer_Vector_({
+var vector = new VectorLayer({
   source: new _ol_source_Vector_({
     url: 'data/kml/timezones.kml',
     format: new KML({
diff --git a/examples/kml.js b/examples/kml.js
index 3ccda3368e..d2004e04f6 100644
--- a/examples/kml.js
+++ b/examples/kml.js
@@ -2,7 +2,7 @@ import Map from '../src/ol/Map.js';
 import View from '../src/ol/View.js';
 import KML from '../src/ol/format/KML.js';
 import TileLayer from '../src/ol/layer/Tile.js';
-import _ol_layer_Vector_ from '../src/ol/layer/Vector.js';
+import VectorLayer from '../src/ol/layer/Vector.js';
 import _ol_source_BingMaps_ from '../src/ol/source/BingMaps.js';
 import _ol_source_Vector_ from '../src/ol/source/Vector.js';
 
@@ -13,7 +13,7 @@ var raster = new TileLayer({
   })
 });
 
-var vector = new _ol_layer_Vector_({
+var vector = new VectorLayer({
   source: new _ol_source_Vector_({
     url: 'data/kml/2012-02-10.kml',
     format: new KML()
diff --git a/examples/layer-z-index.js b/examples/layer-z-index.js
index 337a9017e7..3c87c0e0bf 100644
--- a/examples/layer-z-index.js
+++ b/examples/layer-z-index.js
@@ -2,7 +2,7 @@ import Feature from '../src/ol/Feature.js';
 import Map from '../src/ol/Map.js';
 import View from '../src/ol/View.js';
 import Point from '../src/ol/geom/Point.js';
-import _ol_layer_Vector_ from '../src/ol/layer/Vector.js';
+import VectorLayer from '../src/ol/layer/Vector.js';
 import _ol_source_Vector_ from '../src/ol/source/Vector.js';
 import _ol_style_Fill_ from '../src/ol/style/Fill.js';
 import _ol_style_RegularShape_ from '../src/ol/style/RegularShape.js';
@@ -53,7 +53,7 @@ function createLayer(coordinates, style, zIndex) {
     features: [feature]
   });
 
-  var vectorLayer = new _ol_layer_Vector_({
+  var vectorLayer = new VectorLayer({
     source: source
   });
   vectorLayer.setZIndex(zIndex);
diff --git a/examples/line-arrows.js b/examples/line-arrows.js
index c698dfd5d1..0691346fc2 100644
--- a/examples/line-arrows.js
+++ b/examples/line-arrows.js
@@ -3,7 +3,7 @@ import View from '../src/ol/View.js';
 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 _ol_layer_Vector_ from '../src/ol/layer/Vector.js';
+import VectorLayer from '../src/ol/layer/Vector.js';
 import _ol_source_OSM_ from '../src/ol/source/OSM.js';
 import _ol_source_Vector_ from '../src/ol/source/Vector.js';
 import _ol_style_Icon_ from '../src/ol/style/Icon.js';
@@ -46,7 +46,7 @@ var styleFunction = function(feature) {
 
   return styles;
 };
-var vector = new _ol_layer_Vector_({
+var vector = new VectorLayer({
   source: source,
   style: styleFunction
 });
diff --git a/examples/measure.js b/examples/measure.js
index 84c0120d6b..8f736d0f21 100644
--- a/examples/measure.js
+++ b/examples/measure.js
@@ -7,7 +7,7 @@ import LineString from '../src/ol/geom/LineString.js';
 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 _ol_layer_Vector_ from '../src/ol/layer/Vector.js';
+import VectorLayer from '../src/ol/layer/Vector.js';
 import _ol_source_OSM_ from '../src/ol/source/OSM.js';
 import _ol_source_Vector_ from '../src/ol/source/Vector.js';
 import _ol_style_Circle_ from '../src/ol/style/Circle.js';
@@ -22,7 +22,7 @@ var raster = new TileLayer({
 
 var source = new _ol_source_Vector_();
 
-var vector = new _ol_layer_Vector_({
+var vector = new VectorLayer({
   source: source,
   style: new _ol_style_Style_({
     fill: new _ol_style_Fill_({
diff --git a/examples/modify-features.js b/examples/modify-features.js
index f9999f1df6..cc71a93180 100644
--- a/examples/modify-features.js
+++ b/examples/modify-features.js
@@ -5,7 +5,7 @@ import {defaults as defaultInteractions} from '../src/ol/interaction.js';
 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 _ol_layer_Vector_ from '../src/ol/layer/Vector.js';
+import VectorLayer from '../src/ol/layer/Vector.js';
 import _ol_source_OSM_ from '../src/ol/source/OSM.js';
 import _ol_source_Vector_ from '../src/ol/source/Vector.js';
 
@@ -14,7 +14,7 @@ var raster = new TileLayer({
   source: new _ol_source_OSM_()
 });
 
-var vector = new _ol_layer_Vector_({
+var vector = new VectorLayer({
   source: new _ol_source_Vector_({
     url: 'data/geojson/countries.geojson',
     format: new GeoJSON(),
diff --git a/examples/modify-test.js b/examples/modify-test.js
index 6fe438724a..e107419d9e 100644
--- a/examples/modify-test.js
+++ b/examples/modify-test.js
@@ -4,7 +4,7 @@ import GeoJSON from '../src/ol/format/GeoJSON.js';
 import {defaults as defaultInteractions} from '../src/ol/interaction.js';
 import _ol_interaction_Modify_ from '../src/ol/interaction/Modify.js';
 import _ol_interaction_Select_ from '../src/ol/interaction/Select.js';
-import _ol_layer_Vector_ from '../src/ol/layer/Vector.js';
+import VectorLayer from '../src/ol/layer/Vector.js';
 import _ol_source_Vector_ 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';
@@ -148,7 +148,7 @@ var source = new _ol_source_Vector_({
   features: (new GeoJSON()).readFeatures(geojsonObject)
 });
 
-var layer = new _ol_layer_Vector_({
+var layer = new VectorLayer({
   source: source,
   style: styleFunction
 });
diff --git a/examples/polygon-styles.js b/examples/polygon-styles.js
index b5c8fb2147..498cf46bc0 100644
--- a/examples/polygon-styles.js
+++ b/examples/polygon-styles.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 MultiPoint from '../src/ol/geom/MultiPoint.js';
-import _ol_layer_Vector_ from '../src/ol/layer/Vector.js';
+import VectorLayer from '../src/ol/layer/Vector.js';
 import _ol_source_Vector_ 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';
@@ -84,7 +84,7 @@ var source = new _ol_source_Vector_({
   features: (new GeoJSON()).readFeatures(geojsonObject)
 });
 
-var layer = new _ol_layer_Vector_({
+var layer = new VectorLayer({
   source: source,
   style: styles
 });
diff --git a/examples/regularshape.js b/examples/regularshape.js
index 306115287c..a542739342 100644
--- a/examples/regularshape.js
+++ b/examples/regularshape.js
@@ -2,7 +2,7 @@ import Feature from '../src/ol/Feature.js';
 import Map from '../src/ol/Map.js';
 import View from '../src/ol/View.js';
 import Point from '../src/ol/geom/Point.js';
-import _ol_layer_Vector_ from '../src/ol/layer/Vector.js';
+import VectorLayer from '../src/ol/layer/Vector.js';
 import _ol_source_Vector_ from '../src/ol/source/Vector.js';
 import _ol_style_Fill_ from '../src/ol/style/Fill.js';
 import _ol_style_RegularShape_ from '../src/ol/style/RegularShape.js';
@@ -80,7 +80,7 @@ var source = new _ol_source_Vector_({
   features: features
 });
 
-var vectorLayer = new _ol_layer_Vector_({
+var vectorLayer = new VectorLayer({
   source: source
 });
 
diff --git a/examples/select-features.js b/examples/select-features.js
index c49adeb6e8..b50efd30be 100644
--- a/examples/select-features.js
+++ b/examples/select-features.js
@@ -4,7 +4,7 @@ import _ol_events_condition_ from '../src/ol/events/condition.js';
 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 _ol_layer_Vector_ from '../src/ol/layer/Vector.js';
+import VectorLayer from '../src/ol/layer/Vector.js';
 import _ol_source_OSM_ from '../src/ol/source/OSM.js';
 import _ol_source_Vector_ from '../src/ol/source/Vector.js';
 
@@ -12,7 +12,7 @@ var raster = new TileLayer({
   source: new _ol_source_OSM_()
 });
 
-var vector = new _ol_layer_Vector_({
+var vector = new VectorLayer({
   source: new _ol_source_Vector_({
     url: 'data/geojson/countries.geojson',
     format: new GeoJSON()
diff --git a/examples/snap.js b/examples/snap.js
index fa535aef44..2e72267561 100644
--- a/examples/snap.js
+++ b/examples/snap.js
@@ -5,7 +5,7 @@ import _ol_interaction_Modify_ from '../src/ol/interaction/Modify.js';
 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 _ol_layer_Vector_ from '../src/ol/layer/Vector.js';
+import VectorLayer from '../src/ol/layer/Vector.js';
 import _ol_source_OSM_ from '../src/ol/source/OSM.js';
 import _ol_source_Vector_ from '../src/ol/source/Vector.js';
 import _ol_style_Circle_ from '../src/ol/style/Circle.js';
@@ -17,7 +17,7 @@ var raster = new TileLayer({
   source: new _ol_source_OSM_()
 });
 
-var vector = new _ol_layer_Vector_({
+var vector = new VectorLayer({
   source: new _ol_source_Vector_(),
   style: new _ol_style_Style_({
     fill: new _ol_style_Fill_({
diff --git a/examples/sphere-mollweide.js b/examples/sphere-mollweide.js
index 6e9b741647..910909093d 100644
--- a/examples/sphere-mollweide.js
+++ b/examples/sphere-mollweide.js
@@ -2,7 +2,7 @@ import Graticule from '../src/ol/Graticule.js';
 import Map from '../src/ol/Map.js';
 import View from '../src/ol/View.js';
 import GeoJSON from '../src/ol/format/GeoJSON.js';
-import _ol_layer_Vector_ from '../src/ol/layer/Vector.js';
+import VectorLayer from '../src/ol/layer/Vector.js';
 import _ol_proj_Projection_ from '../src/ol/proj/Projection.js';
 import _ol_source_Vector_ from '../src/ol/source/Vector.js';
 import {register} from '../src/ol/proj/proj4.js';
@@ -25,7 +25,7 @@ var sphereMollweideProjection = new _ol_proj_Projection_({
 var map = new Map({
   keyboardEventTarget: document,
   layers: [
-    new _ol_layer_Vector_({
+    new VectorLayer({
       source: new _ol_source_Vector_({
         url: 'data/geojson/countries-110m.geojson',
         format: new GeoJSON()
diff --git a/examples/street-labels.js b/examples/street-labels.js
index 766599a4e4..d2791cdcb9 100644
--- a/examples/street-labels.js
+++ b/examples/street-labels.js
@@ -3,7 +3,7 @@ import View from '../src/ol/View.js';
 import * as _ol_extent_ from '../src/ol/extent.js';
 import GeoJSON from '../src/ol/format/GeoJSON.js';
 import TileLayer from '../src/ol/layer/Tile.js';
-import _ol_layer_Vector_ from '../src/ol/layer/Vector.js';
+import VectorLayer from '../src/ol/layer/Vector.js';
 import _ol_source_BingMaps_ from '../src/ol/source/BingMaps.js';
 import _ol_source_Vector_ from '../src/ol/source/Vector.js';
 import _ol_style_Fill_ from '../src/ol/style/Fill.js';
@@ -27,7 +27,7 @@ var map = new Map({
       key: 'As1HiMj1PvLPlqc_gtM7AqZfBL8ZL3VrjaS3zIb22Uvb9WKhuJObROC-qUpa81U5',
       imagerySet: 'Aerial'
     })
-  }), new _ol_layer_Vector_({
+  }), new VectorLayer({
     declutter: true,
     source: new _ol_source_Vector_({
       format: new GeoJSON(),
diff --git a/examples/symbol-atlas-webgl.js b/examples/symbol-atlas-webgl.js
index fc07ae1bc6..2e09a2c2fd 100644
--- a/examples/symbol-atlas-webgl.js
+++ b/examples/symbol-atlas-webgl.js
@@ -2,7 +2,7 @@ import Feature from '../src/ol/Feature.js';
 import Map from '../src/ol/Map.js';
 import View from '../src/ol/View.js';
 import Point from '../src/ol/geom/Point.js';
-import _ol_layer_Vector_ from '../src/ol/layer/Vector.js';
+import VectorLayer from '../src/ol/layer/Vector.js';
 import _ol_source_Vector_ from '../src/ol/source/Vector.js';
 import _ol_style_AtlasManager_ from '../src/ol/style/AtlasManager.js';
 import _ol_style_Circle_ from '../src/ol/style/Circle.js';
@@ -102,7 +102,7 @@ for (i = 0; i < featureCount; ++i) {
 var vectorSource = new _ol_source_Vector_({
   features: features
 });
-var vector = new _ol_layer_Vector_({
+var vector = new VectorLayer({
   source: vectorSource
 });
 
diff --git a/examples/synthetic-lines.js b/examples/synthetic-lines.js
index 0e7d9cc436..862e736849 100644
--- a/examples/synthetic-lines.js
+++ b/examples/synthetic-lines.js
@@ -2,7 +2,7 @@ import Feature from '../src/ol/Feature.js';
 import Map from '../src/ol/Map.js';
 import View from '../src/ol/View.js';
 import LineString from '../src/ol/geom/LineString.js';
-import _ol_layer_Vector_ from '../src/ol/layer/Vector.js';
+import VectorLayer from '../src/ol/layer/Vector.js';
 import _ol_source_Vector_ from '../src/ol/source/Vector.js';
 import _ol_style_Stroke_ from '../src/ol/style/Stroke.js';
 import _ol_style_Style_ from '../src/ol/style/Style.js';
@@ -36,7 +36,7 @@ for (i = 0; i < count; ++i) {
   startPoint = endPoint;
 }
 
-var vector = new _ol_layer_Vector_({
+var vector = new VectorLayer({
   source: new _ol_source_Vector_({
     features: features,
     wrapX: false
diff --git a/examples/synthetic-points.js b/examples/synthetic-points.js
index 9def020bb6..644fc49235 100644
--- a/examples/synthetic-points.js
+++ b/examples/synthetic-points.js
@@ -3,7 +3,7 @@ import Map from '../src/ol/Map.js';
 import View from '../src/ol/View.js';
 import LineString from '../src/ol/geom/LineString.js';
 import Point from '../src/ol/geom/Point.js';
-import _ol_layer_Vector_ from '../src/ol/layer/Vector.js';
+import VectorLayer from '../src/ol/layer/Vector.js';
 import _ol_source_Vector_ 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';
@@ -44,7 +44,7 @@ var vectorSource = new _ol_source_Vector_({
   features: features,
   wrapX: false
 });
-var vector = new _ol_layer_Vector_({
+var vector = new VectorLayer({
   source: vectorSource,
   style: function(feature) {
     return styles[feature.get('size')];
diff --git a/examples/tissot.js b/examples/tissot.js
index ab981ac3fe..d9d0d17f28 100644
--- a/examples/tissot.js
+++ b/examples/tissot.js
@@ -3,15 +3,15 @@ import Map from '../src/ol/Map.js';
 import View from '../src/ol/View.js';
 import {circular as circularPolygon} from '../src/ol/geom/Polygon.js';
 import TileLayer from '../src/ol/layer/Tile.js';
-import _ol_layer_Vector_ from '../src/ol/layer/Vector.js';
+import VectorLayer from '../src/ol/layer/Vector.js';
 import _ol_source_TileWMS_ from '../src/ol/source/TileWMS.js';
 import _ol_source_Vector_ from '../src/ol/source/Vector.js';
 
-var vectorLayer4326 = new _ol_layer_Vector_({
+var vectorLayer4326 = new VectorLayer({
   source: new _ol_source_Vector_()
 });
 
-var vectorLayer3857 = new _ol_layer_Vector_({
+var vectorLayer3857 = new VectorLayer({
   source: new _ol_source_Vector_()
 });
 
diff --git a/examples/topojson.js b/examples/topojson.js
index 50688c3ba7..b413d33c86 100644
--- a/examples/topojson.js
+++ b/examples/topojson.js
@@ -2,7 +2,7 @@ import Map from '../src/ol/Map.js';
 import View from '../src/ol/View.js';
 import TopoJSON from '../src/ol/format/TopoJSON.js';
 import TileLayer from '../src/ol/layer/Tile.js';
-import _ol_layer_Vector_ from '../src/ol/layer/Vector.js';
+import VectorLayer from '../src/ol/layer/Vector.js';
 import _ol_source_TileJSON_ from '../src/ol/source/TileJSON.js';
 import _ol_source_Vector_ from '../src/ol/source/Vector.js';
 import _ol_style_Fill_ from '../src/ol/style/Fill.js';
@@ -26,7 +26,7 @@ var style = new _ol_style_Style_({
   })
 });
 
-var vector = new _ol_layer_Vector_({
+var vector = new VectorLayer({
   source: new _ol_source_Vector_({
     url: 'data/topojson/world-110m.json',
     format: new TopoJSON({
diff --git a/examples/topolis.js b/examples/topolis.js
index ebf3b92268..0838df6bc8 100644
--- a/examples/topolis.js
+++ b/examples/topolis.js
@@ -10,7 +10,7 @@ import Polygon from '../src/ol/geom/Polygon.js';
 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 _ol_layer_Vector_ from '../src/ol/layer/Vector.js';
+import VectorLayer from '../src/ol/layer/Vector.js';
 import _ol_source_OSM_ from '../src/ol/source/OSM.js';
 import _ol_source_Vector_ from '../src/ol/source/Vector.js';
 import _ol_style_Style_ from '../src/ol/style/Style.js';
@@ -25,7 +25,7 @@ var raster = new TileLayer({
 });
 
 var nodes = new _ol_source_Vector_({wrapX: false});
-var nodesLayer = new _ol_layer_Vector_({
+var nodesLayer = new VectorLayer({
   source: nodes,
   style: function(f) {
     var style = new _ol_style_Style_({
@@ -48,7 +48,7 @@ var nodesLayer = new _ol_layer_Vector_({
 });
 
 var edges = new _ol_source_Vector_({wrapX: false});
-var edgesLayer = new _ol_layer_Vector_({
+var edgesLayer = new VectorLayer({
   source: edges,
   style: function(f) {
     var style = new _ol_style_Style_({
@@ -70,7 +70,7 @@ var edgesLayer = new _ol_layer_Vector_({
 });
 
 var faces = new _ol_source_Vector_({wrapX: false});
-var facesLayer = new _ol_layer_Vector_({
+var facesLayer = new VectorLayer({
   source: faces,
   style: function(f) {
     var style = new _ol_style_Style_({
diff --git a/examples/translate-features.js b/examples/translate-features.js
index c96af706d6..48c99f7174 100644
--- a/examples/translate-features.js
+++ b/examples/translate-features.js
@@ -5,7 +5,7 @@ import {defaults as defaultInteractions} from '../src/ol/interaction.js';
 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 _ol_layer_Vector_ from '../src/ol/layer/Vector.js';
+import VectorLayer from '../src/ol/layer/Vector.js';
 import _ol_source_OSM_ from '../src/ol/source/OSM.js';
 import _ol_source_Vector_ from '../src/ol/source/Vector.js';
 
@@ -14,7 +14,7 @@ var raster = new TileLayer({
   source: new _ol_source_OSM_()
 });
 
-var vector = new _ol_layer_Vector_({
+var vector = new VectorLayer({
   source: new _ol_source_Vector_({
     url: 'data/geojson/countries.geojson',
     format: new GeoJSON()
diff --git a/examples/turf.js b/examples/turf.js
index 259c608bb8..df41816da2 100644
--- a/examples/turf.js
+++ b/examples/turf.js
@@ -4,7 +4,7 @@ import Map from '../src/ol/Map.js';
 import View from '../src/ol/View.js';
 import GeoJSON from '../src/ol/format/GeoJSON.js';
 import TileLayer from '../src/ol/layer/Tile.js';
-import _ol_layer_Vector_ from '../src/ol/layer/Vector.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 _ol_source_Vector_ from '../src/ol/source/Vector.js';
@@ -38,7 +38,7 @@ fetch('data/geojson/roads-seoul.geojson').then(function(response) {
   street.getGeometry().transform('EPSG:4326', 'EPSG:3857');
   source.addFeature(street);
 });
-var vectorLayer = new _ol_layer_Vector_({
+var vectorLayer = new VectorLayer({
   source: source
 });
 
diff --git a/examples/vector-esri-edit.js b/examples/vector-esri-edit.js
index 9c76588381..fa3fd18991 100644
--- a/examples/vector-esri-edit.js
+++ b/examples/vector-esri-edit.js
@@ -6,7 +6,7 @@ import Draw from '../src/ol/interaction/Draw.js';
 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 _ol_layer_Vector_ from '../src/ol/layer/Vector.js';
+import VectorLayer from '../src/ol/layer/Vector.js';
 import _ol_loadingstrategy_ from '../src/ol/loadingstrategy.js';
 import {fromLonLat} from '../src/ol/proj.js';
 import _ol_source_Vector_ from '../src/ol/source/Vector.js';
@@ -49,7 +49,7 @@ var vectorSource = new _ol_source_Vector_({
   }))
 });
 
-var vector = new _ol_layer_Vector_({
+var vector = new VectorLayer({
   source: vectorSource
 });
 
diff --git a/examples/vector-esri.js b/examples/vector-esri.js
index e99c868dee..cda1aa5aab 100644
--- a/examples/vector-esri.js
+++ b/examples/vector-esri.js
@@ -2,7 +2,7 @@ import Map from '../src/ol/Map.js';
 import View from '../src/ol/View.js';
 import EsriJSON from '../src/ol/format/EsriJSON.js';
 import TileLayer from '../src/ol/layer/Tile.js';
-import _ol_layer_Vector_ from '../src/ol/layer/Vector.js';
+import VectorLayer from '../src/ol/layer/Vector.js';
 import _ol_loadingstrategy_ from '../src/ol/loadingstrategy.js';
 import {fromLonLat} from '../src/ol/proj.js';
 import _ol_source_Vector_ from '../src/ol/source/Vector.js';
@@ -87,7 +87,7 @@ var vectorSource = new _ol_source_Vector_({
   }))
 });
 
-var vector = new _ol_layer_Vector_({
+var vector = new VectorLayer({
   source: vectorSource,
   style: function(feature) {
     var classify = feature.get('activeprod');
diff --git a/examples/vector-label-decluttering.js b/examples/vector-label-decluttering.js
index 87fae48081..e345c321c9 100644
--- a/examples/vector-label-decluttering.js
+++ b/examples/vector-label-decluttering.js
@@ -2,7 +2,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 GeoJSON from '../src/ol/format/GeoJSON.js';
-import _ol_layer_Vector_ from '../src/ol/layer/Vector.js';
+import VectorLayer from '../src/ol/layer/Vector.js';
 import _ol_source_Vector_ from '../src/ol/source/Vector.js';
 import _ol_style_Fill_ from '../src/ol/style/Fill.js';
 import _ol_style_Stroke_ from '../src/ol/style/Stroke.js';
@@ -58,7 +58,7 @@ var countryStyle = new _ol_style_Style_({
 });
 var style = [countryStyle, labelStyle];
 
-var vectorLayer = new _ol_layer_Vector_({
+var vectorLayer = new VectorLayer({
   source: new _ol_source_Vector_({
     url: 'data/geojson/countries.geojson',
     format: new GeoJSON()
diff --git a/examples/vector-labels.js b/examples/vector-labels.js
index c8fc5e4575..cdafad6667 100644
--- a/examples/vector-labels.js
+++ b/examples/vector-labels.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 TileLayer from '../src/ol/layer/Tile.js';
-import _ol_layer_Vector_ from '../src/ol/layer/Vector.js';
+import VectorLayer from '../src/ol/layer/Vector.js';
 import _ol_source_OSM_ from '../src/ol/source/OSM.js';
 import _ol_source_Vector_ from '../src/ol/source/Vector.js';
 import _ol_style_Circle_ from '../src/ol/style/Circle.js';
@@ -140,7 +140,7 @@ function polygonStyleFunction(feature, resolution) {
   });
 }
 
-var vectorPolygons = new _ol_layer_Vector_({
+var vectorPolygons = new VectorLayer({
   source: new _ol_source_Vector_({
     url: 'data/geojson/polygon-samples.geojson',
     format: new GeoJSON()
@@ -160,7 +160,7 @@ function lineStyleFunction(feature, resolution) {
   });
 }
 
-var vectorLines = new _ol_layer_Vector_({
+var vectorLines = new VectorLayer({
   source: new _ol_source_Vector_({
     url: 'data/geojson/line-samples.geojson',
     format: new GeoJSON()
@@ -181,7 +181,7 @@ function pointStyleFunction(feature, resolution) {
   });
 }
 
-var vectorPoints = new _ol_layer_Vector_({
+var vectorPoints = new VectorLayer({
   source: new _ol_source_Vector_({
     url: 'data/geojson/point-samples.geojson',
     format: new GeoJSON()
diff --git a/examples/vector-layer.js b/examples/vector-layer.js
index 238418af65..8e20a4b882 100644
--- a/examples/vector-layer.js
+++ b/examples/vector-layer.js
@@ -1,7 +1,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_layer_Vector_ from '../src/ol/layer/Vector.js';
+import VectorLayer from '../src/ol/layer/Vector.js';
 import _ol_source_Vector_ from '../src/ol/source/Vector.js';
 import _ol_style_Fill_ from '../src/ol/style/Fill.js';
 import _ol_style_Stroke_ from '../src/ol/style/Stroke.js';
@@ -29,7 +29,7 @@ var style = new _ol_style_Style_({
   })
 });
 
-var vectorLayer = new _ol_layer_Vector_({
+var vectorLayer = new VectorLayer({
   source: new _ol_source_Vector_({
     url: 'data/geojson/countries.geojson',
     format: new GeoJSON()
@@ -69,7 +69,7 @@ var highlightStyle = new _ol_style_Style_({
   })
 });
 
-var featureOverlay = new _ol_layer_Vector_({
+var featureOverlay = new VectorLayer({
   source: new _ol_source_Vector_(),
   map: map,
   style: function(feature) {
diff --git a/examples/vector-osm.js b/examples/vector-osm.js
index ed661558b3..c0b271fb7b 100644
--- a/examples/vector-osm.js
+++ b/examples/vector-osm.js
@@ -3,7 +3,7 @@ import View from '../src/ol/View.js';
 import {defaults as defaultControls} from '../src/ol/control.js';
 import OSMXML from '../src/ol/format/OSMXML.js';
 import TileLayer from '../src/ol/layer/Tile.js';
-import _ol_layer_Vector_ from '../src/ol/layer/Vector.js';
+import VectorLayer from '../src/ol/layer/Vector.js';
 import _ol_loadingstrategy_ from '../src/ol/loadingstrategy.js';
 import {transformExtent} from '../src/ol/proj.js';
 import _ol_source_BingMaps_ from '../src/ol/source/BingMaps.js';
@@ -98,7 +98,7 @@ var vectorSource = new _ol_source_Vector_({
   strategy: _ol_loadingstrategy_.bbox
 });
 
-var vector = new _ol_layer_Vector_({
+var vector = new VectorLayer({
   source: vectorSource,
   style: function(feature) {
     for (var key in styles) {
diff --git a/examples/vector-wfs-getfeature.js b/examples/vector-wfs-getfeature.js
index b77d5fcd5b..831e10e802 100644
--- a/examples/vector-wfs-getfeature.js
+++ b/examples/vector-wfs-getfeature.js
@@ -4,7 +4,7 @@ import _ol_format_filter_ from '../src/ol/format/filter.js';
 import WFS from '../src/ol/format/WFS.js';
 import GeoJSON from '../src/ol/format/GeoJSON.js';
 import TileLayer from '../src/ol/layer/Tile.js';
-import _ol_layer_Vector_ from '../src/ol/layer/Vector.js';
+import VectorLayer from '../src/ol/layer/Vector.js';
 import _ol_source_BingMaps_ from '../src/ol/source/BingMaps.js';
 import _ol_source_Vector_ from '../src/ol/source/Vector.js';
 import _ol_style_Stroke_ from '../src/ol/style/Stroke.js';
@@ -12,7 +12,7 @@ import _ol_style_Style_ from '../src/ol/style/Style.js';
 
 
 var vectorSource = new _ol_source_Vector_();
-var vector = new _ol_layer_Vector_({
+var vector = new VectorLayer({
   source: vectorSource,
   style: new _ol_style_Style_({
     stroke: new _ol_style_Stroke_({
diff --git a/examples/vector-wfs.js b/examples/vector-wfs.js
index eb62663647..22d8036eb9 100644
--- a/examples/vector-wfs.js
+++ b/examples/vector-wfs.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 TileLayer from '../src/ol/layer/Tile.js';
-import _ol_layer_Vector_ from '../src/ol/layer/Vector.js';
+import VectorLayer from '../src/ol/layer/Vector.js';
 import _ol_loadingstrategy_ from '../src/ol/loadingstrategy.js';
 import _ol_source_BingMaps_ from '../src/ol/source/BingMaps.js';
 import _ol_source_Vector_ from '../src/ol/source/Vector.js';
@@ -22,7 +22,7 @@ var vectorSource = new _ol_source_Vector_({
 });
 
 
-var vector = new _ol_layer_Vector_({
+var vector = new VectorLayer({
   source: vectorSource,
   style: new _ol_style_Style_({
     stroke: new _ol_style_Stroke_({
diff --git a/examples/wkt.js b/examples/wkt.js
index 49286bb622..efb54cbf68 100644
--- a/examples/wkt.js
+++ b/examples/wkt.js
@@ -2,7 +2,7 @@ import Map from '../src/ol/Map.js';
 import View from '../src/ol/View.js';
 import WKT from '../src/ol/format/WKT.js';
 import TileLayer from '../src/ol/layer/Tile.js';
-import _ol_layer_Vector_ from '../src/ol/layer/Vector.js';
+import VectorLayer from '../src/ol/layer/Vector.js';
 import _ol_source_OSM_ from '../src/ol/source/OSM.js';
 import _ol_source_Vector_ from '../src/ol/source/Vector.js';
 
@@ -21,7 +21,7 @@ var feature = format.readFeature(wkt, {
   featureProjection: 'EPSG:3857'
 });
 
-var vector = new _ol_layer_Vector_({
+var vector = new VectorLayer({
   source: new _ol_source_Vector_({
     features: [feature]
   })
diff --git a/src/ol/interaction/Draw.js b/src/ol/interaction/Draw.js
index e76e409734..5f1278a028 100644
--- a/src/ol/interaction/Draw.js
+++ b/src/ol/interaction/Draw.js
@@ -22,7 +22,7 @@ import Polygon, {fromCircle, makeRegular} from '../geom/Polygon.js';
 import DrawEventType from '../interaction/DrawEventType.js';
 import _ol_interaction_Pointer_ from '../interaction/Pointer.js';
 import _ol_interaction_Property_ from '../interaction/Property.js';
-import _ol_layer_Vector_ from '../layer/Vector.js';
+import VectorLayer from '../layer/Vector.js';
 import _ol_source_Vector_ from '../source/Vector.js';
 import _ol_style_Style_ from '../style/Style.js';
 
@@ -249,7 +249,7 @@ var Draw = function(options) {
    * @type {ol.layer.Vector}
    * @private
    */
-  this.overlay_ = new _ol_layer_Vector_({
+  this.overlay_ = new VectorLayer({
     source: new _ol_source_Vector_({
       useSpatialIndex: false,
       wrapX: options.wrapX ? options.wrapX : false
diff --git a/src/ol/interaction/Extent.js b/src/ol/interaction/Extent.js
index dbb8759ddf..013b77c7a5 100644
--- a/src/ol/interaction/Extent.js
+++ b/src/ol/interaction/Extent.js
@@ -13,7 +13,7 @@ import Point from '../geom/Point.js';
 import {fromExtent as polygonFromExtent} from '../geom/Polygon.js';
 import _ol_interaction_ExtentEventType_ from '../interaction/ExtentEventType.js';
 import _ol_interaction_Pointer_ from '../interaction/Pointer.js';
-import _ol_layer_Vector_ from '../layer/Vector.js';
+import VectorLayer from '../layer/Vector.js';
 import _ol_source_Vector_ from '../source/Vector.js';
 import _ol_style_Style_ from '../style/Style.js';
 
@@ -93,7 +93,7 @@ var _ol_interaction_Extent_ = function(opt_options) {
    * @type {ol.layer.Vector}
    * @private
    */
-  this.extentOverlay_ = new _ol_layer_Vector_({
+  this.extentOverlay_ = new VectorLayer({
     source: new _ol_source_Vector_({
       useSpatialIndex: false,
       wrapX: !!opt_options.wrapX
@@ -108,7 +108,7 @@ var _ol_interaction_Extent_ = function(opt_options) {
    * @type {ol.layer.Vector}
    * @private
    */
-  this.vertexOverlay_ = new _ol_layer_Vector_({
+  this.vertexOverlay_ = new VectorLayer({
     source: new _ol_source_Vector_({
       useSpatialIndex: false,
       wrapX: !!opt_options.wrapX
diff --git a/src/ol/interaction/Modify.js b/src/ol/interaction/Modify.js
index f3914582b5..798804d4da 100644
--- a/src/ol/interaction/Modify.js
+++ b/src/ol/interaction/Modify.js
@@ -18,7 +18,7 @@ import GeometryType from '../geom/GeometryType.js';
 import Point from '../geom/Point.js';
 import _ol_interaction_ModifyEventType_ from '../interaction/ModifyEventType.js';
 import _ol_interaction_Pointer_ from '../interaction/Pointer.js';
-import _ol_layer_Vector_ from '../layer/Vector.js';
+import VectorLayer from '../layer/Vector.js';
 import _ol_source_Vector_ from '../source/Vector.js';
 import VectorEventType from '../source/VectorEventType.js';
 import RBush from '../structs/RBush.js';
@@ -157,7 +157,7 @@ var _ol_interaction_Modify_ = function(options) {
    * @type {ol.layer.Vector}
    * @private
    */
-  this.overlay_ = new _ol_layer_Vector_({
+  this.overlay_ = new VectorLayer({
     source: new _ol_source_Vector_({
       useSpatialIndex: false,
       wrapX: !!options.wrapX
diff --git a/src/ol/interaction/Select.js b/src/ol/interaction/Select.js
index 3cb19f0669..e8943266bf 100644
--- a/src/ol/interaction/Select.js
+++ b/src/ol/interaction/Select.js
@@ -10,7 +10,7 @@ import _ol_events_condition_ from '../events/condition.js';
 import {TRUE} from '../functions.js';
 import GeometryType from '../geom/GeometryType.js';
 import Interaction from '../interaction/Interaction.js';
-import _ol_layer_Vector_ from '../layer/Vector.js';
+import VectorLayer from '../layer/Vector.js';
 import _ol_obj_ from '../obj.js';
 import _ol_source_Vector_ from '../source/Vector.js';
 import _ol_style_Style_ from '../style/Style.js';
@@ -87,7 +87,7 @@ var _ol_interaction_Select_ = function(opt_options) {
    */
   this.hitTolerance_ = options.hitTolerance ? options.hitTolerance : 0;
 
-  var featureOverlay = new _ol_layer_Vector_({
+  var featureOverlay = new VectorLayer({
     source: new _ol_source_Vector_({
       useSpatialIndex: false,
       features: options.features,
diff --git a/src/ol/layer/Heatmap.js b/src/ol/layer/Heatmap.js
index d556f0da58..25397b799f 100644
--- a/src/ol/layer/Heatmap.js
+++ b/src/ol/layer/Heatmap.js
@@ -5,7 +5,7 @@ import _ol_events_ from '../events.js';
 import {inherits} from '../index.js';
 import BaseObject from '../Object.js';
 import {createCanvasContext2D} from '../dom.js';
-import _ol_layer_Vector_ from '../layer/Vector.js';
+import VectorLayer from '../layer/Vector.js';
 import {clamp} from '../math.js';
 import _ol_obj_ from '../obj.js';
 import RenderEventType from '../render/EventType.js';
@@ -54,7 +54,7 @@ var Heatmap = function(opt_options) {
   delete baseOptions.blur;
   delete baseOptions.shadow;
   delete baseOptions.weight;
-  _ol_layer_Vector_.call(this, /** @type {olx.layer.VectorOptions} */ (baseOptions));
+  VectorLayer.call(this, /** @type {olx.layer.VectorOptions} */ (baseOptions));
 
   /**
    * @private
@@ -136,7 +136,7 @@ var Heatmap = function(opt_options) {
   _ol_events_.listen(this, RenderEventType.RENDER, this.handleRender_, this);
 };
 
-inherits(Heatmap, _ol_layer_Vector_);
+inherits(Heatmap, VectorLayer);
 
 
 /**
diff --git a/src/ol/layer/Vector.js b/src/ol/layer/Vector.js
index 0af05ea274..99e0eed12a 100644
--- a/src/ol/layer/Vector.js
+++ b/src/ol/layer/Vector.js
@@ -31,7 +31,7 @@ var Property = {
  * @param {olx.layer.VectorOptions=} opt_options Options.
  * @api
  */
-var _ol_layer_Vector_ = function(opt_options) {
+var VectorLayer = function(opt_options) {
   var options = opt_options ?
     opt_options : /** @type {olx.layer.VectorOptions} */ ({});
 
@@ -101,13 +101,13 @@ var _ol_layer_Vector_ = function(opt_options) {
 
 };
 
-inherits(_ol_layer_Vector_, _ol_layer_Layer_);
+inherits(VectorLayer, _ol_layer_Layer_);
 
 
 /**
  * @return {boolean} Declutter.
  */
-_ol_layer_Vector_.prototype.getDeclutter = function() {
+VectorLayer.prototype.getDeclutter = function() {
   return this.declutter_;
 };
 
@@ -115,7 +115,7 @@ _ol_layer_Vector_.prototype.getDeclutter = function() {
 /**
  * @param {boolean} declutter Declutter.
  */
-_ol_layer_Vector_.prototype.setDeclutter = function(declutter) {
+VectorLayer.prototype.setDeclutter = function(declutter) {
   this.declutter_ = declutter;
 };
 
@@ -123,7 +123,7 @@ _ol_layer_Vector_.prototype.setDeclutter = function(declutter) {
 /**
  * @return {number|undefined} Render buffer.
  */
-_ol_layer_Vector_.prototype.getRenderBuffer = function() {
+VectorLayer.prototype.getRenderBuffer = function() {
   return this.renderBuffer_;
 };
 
@@ -132,7 +132,7 @@ _ol_layer_Vector_.prototype.getRenderBuffer = function() {
  * @return {function(ol.Feature, ol.Feature): number|null|undefined} Render
  *     order.
  */
-_ol_layer_Vector_.prototype.getRenderOrder = function() {
+VectorLayer.prototype.getRenderOrder = function() {
   return (/** @type {ol.RenderOrderFunction|null|undefined} */ this.get(Property.RENDER_ORDER));
 };
 
@@ -143,7 +143,7 @@ _ol_layer_Vector_.prototype.getRenderOrder = function() {
  * @return {ol.source.Vector} Source.
  * @api
  */
-_ol_layer_Vector_.prototype.getSource;
+VectorLayer.prototype.getSource;
 
 
 /**
@@ -153,7 +153,7 @@ _ol_layer_Vector_.prototype.getSource;
  *     Layer style.
  * @api
  */
-_ol_layer_Vector_.prototype.getStyle = function() {
+VectorLayer.prototype.getStyle = function() {
   return this.style_;
 };
 
@@ -163,7 +163,7 @@ _ol_layer_Vector_.prototype.getStyle = function() {
  * @return {ol.StyleFunction|undefined} Layer style function.
  * @api
  */
-_ol_layer_Vector_.prototype.getStyleFunction = function() {
+VectorLayer.prototype.getStyleFunction = function() {
   return this.styleFunction_;
 };
 
@@ -172,7 +172,7 @@ _ol_layer_Vector_.prototype.getStyleFunction = function() {
  * @return {boolean} Whether the rendered layer should be updated while
  *     animating.
  */
-_ol_layer_Vector_.prototype.getUpdateWhileAnimating = function() {
+VectorLayer.prototype.getUpdateWhileAnimating = function() {
   return this.updateWhileAnimating_;
 };
 
@@ -181,7 +181,7 @@ _ol_layer_Vector_.prototype.getUpdateWhileAnimating = function() {
  * @return {boolean} Whether the rendered layer should be updated while
  *     interacting.
  */
-_ol_layer_Vector_.prototype.getUpdateWhileInteracting = function() {
+VectorLayer.prototype.getUpdateWhileInteracting = function() {
   return this.updateWhileInteracting_;
 };
 
@@ -190,7 +190,7 @@ _ol_layer_Vector_.prototype.getUpdateWhileInteracting = function() {
  * @param {ol.RenderOrderFunction|null|undefined} renderOrder
  *     Render order.
  */
-_ol_layer_Vector_.prototype.setRenderOrder = function(renderOrder) {
+VectorLayer.prototype.setRenderOrder = function(renderOrder) {
   this.set(Property.RENDER_ORDER, renderOrder);
 };
 
@@ -206,7 +206,7 @@ _ol_layer_Vector_.prototype.setRenderOrder = function(renderOrder) {
  *     style Layer style.
  * @api
  */
-_ol_layer_Vector_.prototype.setStyle = function(style) {
+VectorLayer.prototype.setStyle = function(style) {
   this.style_ = style !== undefined ? style : _ol_style_Style_.defaultFunction;
   this.styleFunction_ = style === null ?
     undefined : _ol_style_Style_.createFunction(this.style_);
@@ -217,9 +217,9 @@ _ol_layer_Vector_.prototype.setStyle = function(style) {
 /**
  * @return {ol.layer.VectorRenderType|string} The render mode.
  */
-_ol_layer_Vector_.prototype.getRenderMode = function() {
+VectorLayer.prototype.getRenderMode = function() {
   return this.renderMode_;
 };
 
 
-export default _ol_layer_Vector_;
+export default VectorLayer;
diff --git a/src/ol/layer/VectorTile.js b/src/ol/layer/VectorTile.js
index 65f8fe67e5..09fff11053 100644
--- a/src/ol/layer/VectorTile.js
+++ b/src/ol/layer/VectorTile.js
@@ -5,7 +5,7 @@ import {inherits} from '../index.js';
 import LayerType from '../LayerType.js';
 import {assert} from '../asserts.js';
 import _ol_layer_TileProperty_ from '../layer/TileProperty.js';
-import _ol_layer_Vector_ from '../layer/Vector.js';
+import VectorLayer from '../layer/Vector.js';
 import _ol_layer_VectorTileRenderType_ from '../layer/VectorTileRenderType.js';
 import _ol_obj_ from '../obj.js';
 
@@ -39,7 +39,7 @@ var _ol_layer_VectorTile_ = function(opt_options) {
 
   delete baseOptions.preload;
   delete baseOptions.useInterimTilesOnError;
-  _ol_layer_Vector_.call(this,  /** @type {olx.layer.VectorOptions} */ (baseOptions));
+  VectorLayer.call(this,  /** @type {olx.layer.VectorOptions} */ (baseOptions));
 
   this.setPreload(options.preload ? options.preload : 0);
   this.setUseInterimTilesOnError(options.useInterimTilesOnError ?
@@ -54,7 +54,7 @@ var _ol_layer_VectorTile_ = function(opt_options) {
 
 };
 
-inherits(_ol_layer_VectorTile_, _ol_layer_Vector_);
+inherits(_ol_layer_VectorTile_, VectorLayer);
 
 
 /**
diff --git a/test/rendering/ol/layer/vector.test.js b/test/rendering/ol/layer/vector.test.js
index b98f9a10f4..9fa9ffbab3 100644
--- a/test/rendering/ol/layer/vector.test.js
+++ b/test/rendering/ol/layer/vector.test.js
@@ -6,7 +6,7 @@ import Circle from '../../../../src/ol/geom/Circle.js';
 import LineString from '../../../../src/ol/geom/LineString.js';
 import Point from '../../../../src/ol/geom/Point.js';
 import Polygon from '../../../../src/ol/geom/Polygon.js';
-import _ol_layer_Vector_ from '../../../../src/ol/layer/Vector.js';
+import VectorLayer from '../../../../src/ol/layer/Vector.js';
 import _ol_source_Vector_ 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';
@@ -90,7 +90,7 @@ describe('ol.rendering.layer.Vector', function() {
       addCircle(500);
       addPolygon(600);
       addPolygon(720);
-      map.addLayer(new _ol_layer_Vector_({
+      map.addLayer(new VectorLayer({
         source: source
       }));
       map.once('postrender', function() {
@@ -116,7 +116,7 @@ describe('ol.rendering.layer.Vector', function() {
       addCircle(500);
       addPolygon(600);
       addPolygon(720);
-      map.addLayer(new _ol_layer_Vector_({
+      map.addLayer(new VectorLayer({
         renerMode: 'image',
         source: source
       }));
@@ -155,7 +155,7 @@ describe('ol.rendering.layer.Vector', function() {
       ]);
       source.addFeature(smallLine2);
 
-      map.addLayer(new _ol_layer_Vector_({
+      map.addLayer(new VectorLayer({
         source: source,
         opacity: 0.5
       }));
@@ -194,7 +194,7 @@ describe('ol.rendering.layer.Vector', function() {
       ]);
       source.addFeature(smallLine2);
 
-      map.addLayer(new _ol_layer_Vector_({
+      map.addLayer(new VectorLayer({
         renderMode: 'image',
         source: source,
         opacity: 0.5
@@ -210,7 +210,7 @@ describe('ol.rendering.layer.Vector', function() {
       map.getView().setRotation(Math.PI + Math.PI / 4);
       addPolygon(300);
       addCircle(500);
-      map.addLayer(new _ol_layer_Vector_({
+      map.addLayer(new VectorLayer({
         source: source,
         style: new _ol_style_Style_({
           stroke: new _ol_style_Stroke_({
@@ -230,7 +230,7 @@ describe('ol.rendering.layer.Vector', function() {
       map.getView().setRotation(Math.PI + Math.PI / 4);
       addPolygon(300);
       addCircle(500);
-      map.addLayer(new _ol_layer_Vector_({
+      map.addLayer(new VectorLayer({
         renderMode: 'image',
         source: source,
         style: new _ol_style_Style_({
@@ -251,7 +251,7 @@ describe('ol.rendering.layer.Vector', function() {
       addCircle(500);
       addPolygon(300);
       map.skipFeature(source.getFeatures()[1]);
-      map.addLayer(new _ol_layer_Vector_({
+      map.addLayer(new VectorLayer({
         renderMode: 'image',
         source: source,
         style: new _ol_style_Style_({
@@ -283,7 +283,7 @@ describe('ol.rendering.layer.Vector', function() {
       addCircle(500);
       addPolygon(600);
       addPolygon(720);
-      map.addLayer(new _ol_layer_Vector_({
+      map.addLayer(new VectorLayer({
         source: source,
         style: new _ol_style_Style_({
           stroke: new _ol_style_Stroke_({
@@ -307,7 +307,7 @@ describe('ol.rendering.layer.Vector', function() {
       addLineString(250);
       addLineString(600);
       addLineString(720);
-      map.addLayer(new _ol_layer_Vector_({
+      map.addLayer(new VectorLayer({
         source: source,
         style: new _ol_style_Style_({
           stroke: new _ol_style_Stroke_({
@@ -346,7 +346,7 @@ describe('ol.rendering.layer.Vector', function() {
         }
         return color;
       }
-      var layer = new _ol_layer_Vector_({
+      var layer = new VectorLayer({
         source: createSource(true),
         style: function(feature) {
           alternateColor();
@@ -397,7 +397,7 @@ describe('ol.rendering.layer.Vector', function() {
         }
         return color;
       }
-      var layer = new _ol_layer_Vector_({
+      var layer = new VectorLayer({
         source: createSource(true),
         style: function(feature) {
           alternateColor();
@@ -466,7 +466,7 @@ describe('ol.rendering.layer.Vector', function() {
       var format = new GeoJSON({featureProjection: 'EPSG:3857'});
       var feature = format.readFeature(json);
 
-      var layer = new _ol_layer_Vector_({
+      var layer = new VectorLayer({
         source: new _ol_source_Vector_({
           features: [feature]
         }),
@@ -510,7 +510,7 @@ describe('ol.rendering.layer.Vector', function() {
           ]]))
         ]
       });
-      layer = new _ol_layer_Vector_({
+      layer = new VectorLayer({
         renderBuffer: 0,
         source: src
       });
@@ -584,7 +584,7 @@ describe('ol.rendering.layer.Vector', function() {
 
     it('declutters text', function(done) {
       createMap('canvas');
-      var layer = new _ol_layer_Vector_({
+      var layer = new VectorLayer({
         source: source
       });
       map.addLayer(layer);
@@ -624,7 +624,7 @@ describe('ol.rendering.layer.Vector', function() {
 
     it('declutters text with renderMode: \'image\'', function(done) {
       createMap('canvas');
-      var layer = new _ol_layer_Vector_({
+      var layer = new VectorLayer({
         renderMode: 'image',
         source: source
       });
@@ -665,7 +665,7 @@ describe('ol.rendering.layer.Vector', function() {
 
     it('declutters text and respects z-index', function(done) {
       createMap('canvas');
-      var layer = new _ol_layer_Vector_({
+      var layer = new VectorLayer({
         source: source
       });
       map.addLayer(layer);
@@ -705,7 +705,7 @@ describe('ol.rendering.layer.Vector', function() {
 
     it('declutters images', function(done) {
       createMap('canvas');
-      var layer = new _ol_layer_Vector_({
+      var layer = new VectorLayer({
         source: source
       });
       map.addLayer(layer);
@@ -744,7 +744,7 @@ describe('ol.rendering.layer.Vector', function() {
 
     it('declutters images with renderMode: \'image\'', function(done) {
       createMap('canvas');
-      var layer = new _ol_layer_Vector_({
+      var layer = new VectorLayer({
         renderMode: 'image',
         source: source
       });
@@ -784,7 +784,7 @@ describe('ol.rendering.layer.Vector', function() {
 
     it('declutters images and respects z-index', function(done) {
       createMap('canvas');
-      var layer = new _ol_layer_Vector_({
+      var layer = new VectorLayer({
         source: source
       });
       map.addLayer(layer);
@@ -823,7 +823,7 @@ describe('ol.rendering.layer.Vector', function() {
 
     it('declutters image & text groups', function(done) {
       createMap('canvas');
-      var layer = new _ol_layer_Vector_({
+      var layer = new VectorLayer({
         source: source
       });
       map.addLayer(layer);
@@ -867,7 +867,7 @@ describe('ol.rendering.layer.Vector', function() {
 
     it('declutters text along lines and images', function(done) {
       createMap('canvas');
-      var layer = new _ol_layer_Vector_({
+      var layer = new VectorLayer({
         source: source
       });
       map.addLayer(layer);
@@ -910,7 +910,7 @@ describe('ol.rendering.layer.Vector', function() {
 
     it('declutters text along lines and images with renderMode: \'image\'', function(done) {
       createMap('canvas');
-      var layer = new _ol_layer_Vector_({
+      var layer = new VectorLayer({
         source: source
       });
       map.addLayer(layer);
@@ -953,7 +953,7 @@ describe('ol.rendering.layer.Vector', function() {
 
     it('declutters text along lines and images with z-index', function(done) {
       createMap('canvas');
-      var layer = new _ol_layer_Vector_({
+      var layer = new VectorLayer({
         source: source
       });
       map.addLayer(layer);
diff --git a/test/rendering/ol/layer/vectortile.test.js b/test/rendering/ol/layer/vectortile.test.js
index 9e0f2d1dde..a8eeab0add 100644
--- a/test/rendering/ol/layer/vectortile.test.js
+++ b/test/rendering/ol/layer/vectortile.test.js
@@ -3,7 +3,7 @@ import Map from '../../../../src/ol/Map.js';
 import View from '../../../../src/ol/View.js';
 import MVT from '../../../../src/ol/format/MVT.js';
 import Point from '../../../../src/ol/geom/Point.js';
-import _ol_layer_Vector_ from '../../../../src/ol/layer/Vector.js';
+import VectorLayer from '../../../../src/ol/layer/Vector.js';
 import _ol_layer_VectorTile_ from '../../../../src/ol/layer/VectorTile.js';
 import _ol_obj_ from '../../../../src/ol/obj.js';
 import _ol_source_Vector_ from '../../../../src/ol/source/Vector.js';
@@ -101,7 +101,7 @@ describe('ol.rendering.layer.VectorTile', function() {
           new Feature(new Point([1825727.7316762917, 6143091.089223046]))
         ]
       });
-      map.addLayer(new _ol_layer_Vector_({
+      map.addLayer(new VectorLayer({
         zIndex: 1,
         source: vectorSource,
         style: new _ol_style_Style_({
diff --git a/test/rendering/ol/map.test.js b/test/rendering/ol/map.test.js
index e87fae31b9..159a3c4b81 100644
--- a/test/rendering/ol/map.test.js
+++ b/test/rendering/ol/map.test.js
@@ -2,7 +2,7 @@ import Feature from '../../../src/ol/Feature.js';
 import Point from '../../../src/ol/geom/Point.js';
 import Map from '../../../src/ol/Map.js';
 import View from '../../../src/ol/View.js';
-import _ol_layer_Vector_ from '../../../src/ol/layer/Vector.js';
+import VectorLayer from '../../../src/ol/layer/Vector.js';
 import _ol_source_Vector_ from '../../../src/ol/source/Vector.js';
 
 
@@ -10,7 +10,7 @@ describe('ol.rendering.Map', function() {
 
   var map;
   function createMap(renderer) {
-    var vectorLayer = new _ol_layer_Vector_({
+    var vectorLayer = new VectorLayer({
       source: new _ol_source_Vector_({
         features: [new Feature({
           geometry: new Point([0, 0])
diff --git a/test/rendering/ol/style/circle.test.js b/test/rendering/ol/style/circle.test.js
index 1d205521b5..6a795f0431 100644
--- a/test/rendering/ol/style/circle.test.js
+++ b/test/rendering/ol/style/circle.test.js
@@ -3,7 +3,7 @@ import Point from '../../../../src/ol/geom/Point.js';
 import MultiPoint from '../../../../src/ol/geom/MultiPoint.js';
 import Map from '../../../../src/ol/Map.js';
 import View from '../../../../src/ol/View.js';
-import _ol_layer_Vector_ from '../../../../src/ol/layer/Vector.js';
+import VectorLayer from '../../../../src/ol/layer/Vector.js';
 import _ol_source_Vector_ 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 @@ describe('ol.rendering.style.Circle', function() {
 
   function createMap(renderer) {
     vectorSource = new _ol_source_Vector_();
-    var vectorLayer = new _ol_layer_Vector_({
+    var vectorLayer = new VectorLayer({
       source: vectorSource
     });
 
diff --git a/test/rendering/ol/style/icon.test.js b/test/rendering/ol/style/icon.test.js
index 0032b3d0a9..b1a1d67c25 100644
--- a/test/rendering/ol/style/icon.test.js
+++ b/test/rendering/ol/style/icon.test.js
@@ -2,7 +2,7 @@ import Feature from '../../../../src/ol/Feature.js';
 import Point from '../../../../src/ol/geom/Point.js';
 import Map from '../../../../src/ol/Map.js';
 import View from '../../../../src/ol/View.js';
-import _ol_layer_Vector_ from '../../../../src/ol/layer/Vector.js';
+import VectorLayer from '../../../../src/ol/layer/Vector.js';
 import _ol_source_Vector_ from '../../../../src/ol/source/Vector.js';
 import _ol_style_Icon_ from '../../../../src/ol/style/Icon.js';
 import _ol_style_Style_ from '../../../../src/ol/style/Style.js';
@@ -23,7 +23,7 @@ describe('ol.rendering.style.Icon', function() {
 
   function createMap(renderer, width, height) {
     vectorSource = new _ol_source_Vector_();
-    var vectorLayer = new _ol_layer_Vector_({
+    var vectorLayer = new VectorLayer({
       source: vectorSource
     });
 
diff --git a/test/rendering/ol/style/linestring.test.js b/test/rendering/ol/style/linestring.test.js
index 0c29242005..5ad79bf3b6 100644
--- a/test/rendering/ol/style/linestring.test.js
+++ b/test/rendering/ol/style/linestring.test.js
@@ -2,7 +2,7 @@ import Feature from '../../../../src/ol/Feature.js';
 import LineString from '../../../../src/ol/geom/LineString.js';
 import Map from '../../../../src/ol/Map.js';
 import View from '../../../../src/ol/View.js';
-import _ol_layer_Vector_ from '../../../../src/ol/layer/Vector.js';
+import VectorLayer from '../../../../src/ol/layer/Vector.js';
 import _ol_source_Vector_ 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';
@@ -14,7 +14,7 @@ describe('ol.rendering.style.LineString', function() {
 
   function createMap(renderer, opt_pixelRatio) {
     vectorSource = new _ol_source_Vector_();
-    var vectorLayer = new _ol_layer_Vector_({
+    var vectorLayer = new VectorLayer({
       source: vectorSource
     });
 
diff --git a/test/rendering/ol/style/polygon.test.js b/test/rendering/ol/style/polygon.test.js
index c042abfd07..aaf91ac3a2 100644
--- a/test/rendering/ol/style/polygon.test.js
+++ b/test/rendering/ol/style/polygon.test.js
@@ -2,7 +2,7 @@ import Feature from '../../../../src/ol/Feature.js';
 import Polygon from '../../../../src/ol/geom/Polygon.js';
 import Map from '../../../../src/ol/Map.js';
 import View from '../../../../src/ol/View.js';
-import _ol_layer_Vector_ from '../../../../src/ol/layer/Vector.js';
+import VectorLayer from '../../../../src/ol/layer/Vector.js';
 import _ol_source_Vector_ from '../../../../src/ol/source/Vector.js';
 import _ol_style_Fill_ from '../../../../src/ol/style/Fill.js';
 import _ol_style_Style_ from '../../../../src/ol/style/Style.js';
@@ -17,7 +17,7 @@ describe('ol.rendering.style.Polygon', function() {
     var size = opt_size || 50;
 
     vectorSource = new _ol_source_Vector_();
-    var vectorLayer = new _ol_layer_Vector_({
+    var vectorLayer = new VectorLayer({
       source: vectorSource
     });
 
diff --git a/test/rendering/ol/style/regularshape.test.js b/test/rendering/ol/style/regularshape.test.js
index 02094b3dca..978b5cff42 100644
--- a/test/rendering/ol/style/regularshape.test.js
+++ b/test/rendering/ol/style/regularshape.test.js
@@ -2,7 +2,7 @@ import Feature from '../../../../src/ol/Feature.js';
 import Point from '../../../../src/ol/geom/Point.js';
 import Map from '../../../../src/ol/Map.js';
 import View from '../../../../src/ol/View.js';
-import _ol_layer_Vector_ from '../../../../src/ol/layer/Vector.js';
+import VectorLayer from '../../../../src/ol/layer/Vector.js';
 import _ol_source_Vector_ from '../../../../src/ol/source/Vector.js';
 import _ol_style_Fill_ from '../../../../src/ol/style/Fill.js';
 import _ol_style_RegularShape_ from '../../../../src/ol/style/RegularShape.js';
@@ -16,7 +16,7 @@ describe('ol.rendering.style.RegularShape', function() {
 
   function createMap(renderer) {
     vectorSource = new _ol_source_Vector_();
-    var vectorLayer = new _ol_layer_Vector_({
+    var vectorLayer = new VectorLayer({
       source: vectorSource
     });
 
diff --git a/test/rendering/ol/style/text.test.js b/test/rendering/ol/style/text.test.js
index a9819f90d1..67e07f79a9 100644
--- a/test/rendering/ol/style/text.test.js
+++ b/test/rendering/ol/style/text.test.js
@@ -6,7 +6,7 @@ import Point from '../../../../src/ol/geom/Point.js';
 import Polygon from '../../../../src/ol/geom/Polygon.js';
 import Map from '../../../../src/ol/Map.js';
 import View from '../../../../src/ol/View.js';
-import _ol_layer_Vector_ from '../../../../src/ol/layer/Vector.js';
+import VectorLayer from '../../../../src/ol/layer/Vector.js';
 import _ol_source_Vector_ from '../../../../src/ol/source/Vector.js';
 import _ol_style_Text_ from '../../../../src/ol/style/Text.js';
 import _ol_style_Fill_ from '../../../../src/ol/style/Fill.js';
@@ -20,7 +20,7 @@ describe('ol.rendering.style.Text', function() {
   function createMap(renderer, opt_pixelRatio) {
     var pixelRatio = opt_pixelRatio || 1;
     vectorSource = new _ol_source_Vector_();
-    var vectorLayer = new _ol_layer_Vector_({
+    var vectorLayer = new VectorLayer({
       source: vectorSource
     });
 
diff --git a/test/spec/ol/interaction/dragrotateandzoom.test.js b/test/spec/ol/interaction/dragrotateandzoom.test.js
index 246f4139fc..ea00313edc 100644
--- a/test/spec/ol/interaction/dragrotateandzoom.test.js
+++ b/test/spec/ol/interaction/dragrotateandzoom.test.js
@@ -3,7 +3,7 @@ import MapBrowserPointerEvent from '../../../../src/ol/MapBrowserPointerEvent.js
 import View from '../../../../src/ol/View.js';
 import DragRotateAndZoom from '../../../../src/ol/interaction/DragRotateAndZoom.js';
 import Interaction from '../../../../src/ol/interaction/Interaction.js';
-import _ol_layer_Vector_ from '../../../../src/ol/layer/Vector.js';
+import VectorLayer from '../../../../src/ol/layer/Vector.js';
 import _ol_pointer_PointerEvent_ from '../../../../src/ol/pointer/PointerEvent.js';
 import _ol_source_Vector_ from '../../../../src/ol/source/Vector.js';
 
@@ -35,7 +35,7 @@ describe('ol.interaction.DragRotateAndZoom', function() {
       style.height = height + 'px';
       document.body.appendChild(target);
       var source = new _ol_source_Vector_();
-      var layer = new _ol_layer_Vector_({source: source});
+      var layer = new VectorLayer({source: source});
       interaction = new DragRotateAndZoom();
       map = new Map({
         target: target,
diff --git a/test/spec/ol/interaction/dragzoom.test.js b/test/spec/ol/interaction/dragzoom.test.js
index 17bc6b682b..cedc563da3 100644
--- a/test/spec/ol/interaction/dragzoom.test.js
+++ b/test/spec/ol/interaction/dragzoom.test.js
@@ -3,7 +3,7 @@ import View from '../../../../src/ol/View.js';
 import * as _ol_extent_ from '../../../../src/ol/extent.js';
 import {fromExtent as polygonFromExtent} from '../../../../src/ol/geom/Polygon.js';
 import DragZoom from '../../../../src/ol/interaction/DragZoom.js';
-import _ol_layer_Vector_ from '../../../../src/ol/layer/Vector.js';
+import VectorLayer from '../../../../src/ol/layer/Vector.js';
 import _ol_render_Box_ from '../../../../src/ol/render/Box.js';
 import _ol_source_Vector_ from '../../../../src/ol/source/Vector.js';
 
@@ -25,7 +25,7 @@ describe('ol.interaction.DragZoom', function() {
     style.height = height + 'px';
     document.body.appendChild(target);
     source = new _ol_source_Vector_();
-    var layer = new _ol_layer_Vector_({source: source});
+    var layer = new VectorLayer({source: source});
     map = new Map({
       target: target,
       layers: [layer],
diff --git a/test/spec/ol/interaction/draw.test.js b/test/spec/ol/interaction/draw.test.js
index 337115373a..4d7a22005a 100644
--- a/test/spec/ol/interaction/draw.test.js
+++ b/test/spec/ol/interaction/draw.test.js
@@ -14,7 +14,7 @@ import Point from '../../../../src/ol/geom/Point.js';
 import Polygon from '../../../../src/ol/geom/Polygon.js';
 import Draw from '../../../../src/ol/interaction/Draw.js';
 import Interaction from '../../../../src/ol/interaction/Interaction.js';
-import _ol_layer_Vector_ from '../../../../src/ol/layer/Vector.js';
+import VectorLayer from '../../../../src/ol/layer/Vector.js';
 import _ol_pointer_PointerEvent_ from '../../../../src/ol/pointer/PointerEvent.js';
 import _ol_source_Vector_ from '../../../../src/ol/source/Vector.js';
 
@@ -35,7 +35,7 @@ describe('ol.interaction.Draw', function() {
     style.height = height + 'px';
     document.body.appendChild(target);
     source = new _ol_source_Vector_();
-    var layer = new _ol_layer_Vector_({source: source});
+    var layer = new VectorLayer({source: source});
     map = new Map({
       target: target,
       layers: [layer],
diff --git a/test/spec/ol/interaction/modify.test.js b/test/spec/ol/interaction/modify.test.js
index 167a94bc05..49de0990a3 100644
--- a/test/spec/ol/interaction/modify.test.js
+++ b/test/spec/ol/interaction/modify.test.js
@@ -10,7 +10,7 @@ import LineString from '../../../../src/ol/geom/LineString.js';
 import Point from '../../../../src/ol/geom/Point.js';
 import Polygon from '../../../../src/ol/geom/Polygon.js';
 import _ol_interaction_Modify_ from '../../../../src/ol/interaction/Modify.js';
-import _ol_layer_Vector_ from '../../../../src/ol/layer/Vector.js';
+import VectorLayer from '../../../../src/ol/layer/Vector.js';
 import _ol_pointer_PointerEvent_ from '../../../../src/ol/pointer/PointerEvent.js';
 import _ol_source_Vector_ from '../../../../src/ol/source/Vector.js';
 
@@ -45,7 +45,7 @@ describe('ol.interaction.Modify', function() {
       features: features
     });
 
-    var layer = new _ol_layer_Vector_({source: source});
+    var layer = new VectorLayer({source: source});
 
     map = new Map({
       target: target,
diff --git a/test/spec/ol/interaction/select.test.js b/test/spec/ol/interaction/select.test.js
index 4fa928061b..abf087a005 100644
--- a/test/spec/ol/interaction/select.test.js
+++ b/test/spec/ol/interaction/select.test.js
@@ -7,7 +7,7 @@ import View from '../../../../src/ol/View.js';
 import Polygon from '../../../../src/ol/geom/Polygon.js';
 import Interaction from '../../../../src/ol/interaction/Interaction.js';
 import _ol_interaction_Select_ from '../../../../src/ol/interaction/Select.js';
-import _ol_layer_Vector_ from '../../../../src/ol/layer/Vector.js';
+import VectorLayer from '../../../../src/ol/layer/Vector.js';
 import _ol_pointer_PointerEvent_ from '../../../../src/ol/pointer/PointerEvent.js';
 import _ol_source_Vector_ from '../../../../src/ol/source/Vector.js';
 
@@ -57,7 +57,7 @@ describe('ol.interaction.Select', function() {
       features: features
     });
 
-    layer = new _ol_layer_Vector_({source: source});
+    layer = new VectorLayer({source: source});
 
     map = new Map({
       target: target,
@@ -357,7 +357,7 @@ describe('ol.interaction.Select', function() {
         var layer_ = interaction.getLayer(feature);
         expect(e.selected).to.have.length(1);
         expect(feature).to.be.a(Feature);
-        expect(layer_).to.be.a(_ol_layer_Vector_);
+        expect(layer_).to.be.a(VectorLayer);
         expect(layer_).to.equal(layer);
       });
       interaction.on('select', listenerSpy);
diff --git a/test/spec/ol/interaction/translate.test.js b/test/spec/ol/interaction/translate.test.js
index e8d43cc775..568c710474 100644
--- a/test/spec/ol/interaction/translate.test.js
+++ b/test/spec/ol/interaction/translate.test.js
@@ -6,7 +6,7 @@ import View from '../../../../src/ol/View.js';
 import Point from '../../../../src/ol/geom/Point.js';
 import _ol_interaction_Translate_ from '../../../../src/ol/interaction/Translate.js';
 import Interaction from '../../../../src/ol/interaction/Interaction.js';
-import _ol_layer_Vector_ from '../../../../src/ol/layer/Vector.js';
+import VectorLayer from '../../../../src/ol/layer/Vector.js';
 import _ol_pointer_PointerEvent_ from '../../../../src/ol/pointer/PointerEvent.js';
 import _ol_source_Vector_ from '../../../../src/ol/source/Vector.js';
 
@@ -33,7 +33,7 @@ describe('ol.interaction.Translate', function() {
       geometry: new Point([20, -30])
     })];
     source.addFeatures(features);
-    var layer = new _ol_layer_Vector_({source: source});
+    var layer = new VectorLayer({source: source});
     map = new Map({
       target: target,
       layers: [layer],
diff --git a/test/spec/ol/layer/vector.test.js b/test/spec/ol/layer/vector.test.js
index da9cfb601f..871dd4c51c 100644
--- a/test/spec/ol/layer/vector.test.js
+++ b/test/spec/ol/layer/vector.test.js
@@ -1,5 +1,5 @@
 import _ol_layer_Layer_ from '../../../../src/ol/layer/Layer.js';
-import _ol_layer_Vector_ from '../../../../src/ol/layer/Vector.js';
+import VectorLayer from '../../../../src/ol/layer/Vector.js';
 import _ol_source_Vector_ from '../../../../src/ol/source/Vector.js';
 import _ol_style_Style_ from '../../../../src/ol/style/Style.js';
 
@@ -11,13 +11,13 @@ describe('ol.layer.Vector', function() {
     var style = new _ol_style_Style_();
 
     it('creates a new layer', function() {
-      var layer = new _ol_layer_Vector_({source: source});
-      expect(layer).to.be.a(_ol_layer_Vector_);
+      var layer = new VectorLayer({source: source});
+      expect(layer).to.be.a(VectorLayer);
       expect(layer).to.be.a(_ol_layer_Layer_);
     });
 
     it('accepts a style option with a single style', function() {
-      var layer = new _ol_layer_Vector_({
+      var layer = new VectorLayer({
         source: source,
         style: style
       });
@@ -27,7 +27,7 @@ describe('ol.layer.Vector', function() {
     });
 
     it('accepts a style option with an array of styles', function() {
-      var layer = new _ol_layer_Vector_({
+      var layer = new VectorLayer({
         source: source,
         style: [style]
       });
@@ -37,7 +37,7 @@ describe('ol.layer.Vector', function() {
     });
 
     it('accepts a style option with a style function', function() {
-      var layer = new _ol_layer_Vector_({
+      var layer = new VectorLayer({
         source: source,
         style: function(feature, resolution) {
           return [style];
@@ -55,7 +55,7 @@ describe('ol.layer.Vector', function() {
     var layer, style;
 
     beforeEach(function() {
-      layer = new _ol_layer_Vector_({
+      layer = new VectorLayer({
         source: new _ol_source_Vector_()
       });
       style = new _ol_style_Style_();
@@ -101,7 +101,7 @@ describe('ol.layer.Vector', function() {
     var style = new _ol_style_Style_();
 
     it('returns what is provided to setStyle', function() {
-      var layer = new _ol_layer_Vector_({
+      var layer = new VectorLayer({
         source: source
       });
 
diff --git a/test/spec/ol/map.test.js b/test/spec/ol/map.test.js
index cb6596de88..e1807b66b4 100644
--- a/test/spec/ol/map.test.js
+++ b/test/spec/ol/map.test.js
@@ -11,7 +11,7 @@ import Interaction from '../../../src/ol/interaction/Interaction.js';
 import MouseWheelZoom from '../../../src/ol/interaction/MouseWheelZoom.js';
 import _ol_interaction_PinchZoom_ from '../../../src/ol/interaction/PinchZoom.js';
 import TileLayer from '../../../src/ol/layer/Tile.js';
-import _ol_layer_Vector_ from '../../../src/ol/layer/Vector.js';
+import VectorLayer from '../../../src/ol/layer/Vector.js';
 import _ol_renderer_canvas_IntermediateCanvas_ from '../../../src/ol/renderer/canvas/IntermediateCanvas.js';
 import _ol_source_Vector_ from '../../../src/ol/source/Vector.js';
 import _ol_source_XYZ_ from '../../../src/ol/source/XYZ.js';
@@ -195,7 +195,7 @@ describe('ol.Map', function() {
       document.body.appendChild(target);
       map = new Map({
         target: target,
-        layers: [new _ol_layer_Vector_({
+        layers: [new VectorLayer({
           source: new _ol_source_Vector_({
             features: [new Feature(new LineString([[-50, 0], [50, 0]]))]
           })
@@ -225,7 +225,7 @@ describe('ol.Map', function() {
     it('returns an array of found features with declutter: true', function() {
       var layer = map.getLayers().item(0);
       map.removeLayer(layer);
-      var otherLayer = new _ol_layer_Vector_({
+      var otherLayer = new VectorLayer({
         declutter: true,
         source: layer.getSource()
       });
@@ -237,7 +237,7 @@ describe('ol.Map', function() {
     });
 
     it('respects options', function() {
-      var otherLayer = new _ol_layer_Vector_({
+      var otherLayer = new VectorLayer({
         source: new _ol_source_Vector_
       });
       map.addLayer(otherLayer);
diff --git a/test/spec/ol/renderer/canvas/map.test.js b/test/spec/ol/renderer/canvas/map.test.js
index 9c97a95bc1..d2bffadfd7 100644
--- a/test/spec/ol/renderer/canvas/map.test.js
+++ b/test/spec/ol/renderer/canvas/map.test.js
@@ -4,7 +4,7 @@ import Map from '../../../../../src/ol/Map.js';
 import View from '../../../../../src/ol/View.js';
 import Point from '../../../../../src/ol/geom/Point.js';
 import TileLayer from '../../../../../src/ol/layer/Tile.js';
-import _ol_layer_Vector_ from '../../../../../src/ol/layer/Vector.js';
+import VectorLayer from '../../../../../src/ol/layer/Vector.js';
 import _ol_renderer_canvas_Layer_ from '../../../../../src/ol/renderer/canvas/Layer.js';
 import CanvasMapRenderer from '../../../../../src/ol/renderer/canvas/Map.js';
 import _ol_source_Vector_ from '../../../../../src/ol/source/Vector.js';
@@ -50,7 +50,7 @@ describe('ol.renderer.canvas.Map', function() {
       };
       img.src = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAAAAAA6fptVAAAACklEQVR4nGNiAAAABgADNjd8qAAAAABJRU5ErkJggg==';
 
-      layer = new _ol_layer_Vector_({
+      layer = new VectorLayer({
         source: new _ol_source_Vector_({
           features: [
             new Feature({
@@ -92,7 +92,7 @@ describe('ol.renderer.canvas.Map', function() {
 
     it('calls callback with main layer when skipped feature on unmanaged layer', function() {
       var feature = layer.getSource().getFeatures()[0];
-      var managedLayer = new _ol_layer_Vector_({
+      var managedLayer = new VectorLayer({
         source: new _ol_source_Vector_({
           features: [feature]
         })
@@ -169,7 +169,7 @@ describe('ol.renderer.canvas.Map', function() {
     beforeEach(function() {
       map = new Map({});
       map.on('postcompose', function() {});
-      layer = new _ol_layer_Vector_({
+      layer = new VectorLayer({
         source: new _ol_source_Vector_({wrapX: true})
       });
       renderer = map.getRenderer();
diff --git a/test/spec/ol/renderer/canvas/vectorlayer.test.js b/test/spec/ol/renderer/canvas/vectorlayer.test.js
index 62f87ad664..3138e1bc28 100644
--- a/test/spec/ol/renderer/canvas/vectorlayer.test.js
+++ b/test/spec/ol/renderer/canvas/vectorlayer.test.js
@@ -4,7 +4,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 Point from '../../../../../src/ol/geom/Point.js';
-import _ol_layer_Vector_ from '../../../../../src/ol/layer/Vector.js';
+import VectorLayer from '../../../../../src/ol/layer/Vector.js';
 import _ol_obj_ from '../../../../../src/ol/obj.js';
 import {get as getProjection} from '../../../../../src/ol/proj.js';
 import _ol_render_canvas_ from '../../../../../src/ol/render/canvas.js';
@@ -37,7 +37,7 @@ describe('ol.renderer.canvas.VectorLayer', function() {
     });
 
     it('creates a new instance', function() {
-      var layer = new _ol_layer_Vector_({
+      var layer = new VectorLayer({
         source: new _ol_source_Vector_()
       });
       var renderer = new CanvasVectorLayerRenderer(layer);
@@ -69,7 +69,7 @@ describe('ol.renderer.canvas.VectorLayer', function() {
       var feature1 = new Feature(new Point([0, 0]));
       var feature2 = new Feature(new Point([0, 0]));
       feature2.setStyle(featureStyle);
-      var layer = new _ol_layer_Vector_({
+      var layer = new VectorLayer({
         source: new _ol_source_Vector_({
           features: [feature1, feature2]
         }),
@@ -101,7 +101,7 @@ describe('ol.renderer.canvas.VectorLayer', function() {
       });
 
       var feature = new Feature(new Point([0, 0]));
-      var layer = new _ol_layer_Vector_({
+      var layer = new VectorLayer({
         source: new _ol_source_Vector_({
           features: [feature]
         }),
@@ -132,7 +132,7 @@ describe('ol.renderer.canvas.VectorLayer', function() {
       });
 
       var feature = new Feature(new Point([0, 0]));
-      var layer = new _ol_layer_Vector_({
+      var layer = new VectorLayer({
         source: new _ol_source_Vector_({
           features: [feature]
         }),
@@ -164,7 +164,7 @@ describe('ol.renderer.canvas.VectorLayer', function() {
       });
 
       var feature = new Feature(new Point([0, 0]));
-      var layer = new _ol_layer_Vector_({
+      var layer = new VectorLayer({
         source: new _ol_source_Vector_({
           features: [feature]
         }),
@@ -185,7 +185,7 @@ describe('ol.renderer.canvas.VectorLayer', function() {
     var layer, renderer;
 
     beforeEach(function() {
-      layer = new _ol_layer_Vector_({
+      layer = new VectorLayer({
         source: new _ol_source_Vector_()
       });
       renderer = new CanvasVectorLayerRenderer(layer);
@@ -222,7 +222,7 @@ describe('ol.renderer.canvas.VectorLayer', function() {
     var frameState, projExtent, renderer, worldWidth, buffer;
 
     beforeEach(function() {
-      var layer = new _ol_layer_Vector_({
+      var layer = new VectorLayer({
         source: new _ol_source_Vector_({wrapX: true})
       });
       renderer = new CanvasVectorLayerRenderer(layer);
diff --git a/test/spec/ol/source/vector.test.js b/test/spec/ol/source/vector.test.js
index 2dde702af9..184a6c63aa 100644
--- a/test/spec/ol/source/vector.test.js
+++ b/test/spec/ol/source/vector.test.js
@@ -5,7 +5,7 @@ import Map from '../../../../src/ol/Map.js';
 import View from '../../../../src/ol/View.js';
 import Point from '../../../../src/ol/geom/Point.js';
 import LineString from '../../../../src/ol/geom/LineString.js';
-import _ol_layer_Vector_ from '../../../../src/ol/layer/Vector.js';
+import VectorLayer from '../../../../src/ol/layer/Vector.js';
 import _ol_loadingstrategy_ from '../../../../src/ol/loadingstrategy.js';
 import {get as getProjection, transformExtent, fromLonLat} from '../../../../src/ol/proj.js';
 import _ol_source_Vector_ from '../../../../src/ol/source/Vector.js';
@@ -441,7 +441,7 @@ describe('ol.source.Vector', function() {
         var map = new Map({
           target: div,
           layers: [
-            new _ol_layer_Vector_({
+            new VectorLayer({
               source: source
             })
           ],