diff --git a/examples/blend-modes.js b/examples/blend-modes.js
index 3c588f8775..45e900d178 100644
--- a/examples/blend-modes.js
+++ b/examples/blend-modes.js
@@ -4,7 +4,7 @@ import View from '../src/ol/View.js';
 import Point from '../src/ol/geom/Point.js';
 import VectorLayer from '../src/ol/layer/Vector.js';
 import VectorSource from '../src/ol/source/Vector.js';
-import _ol_style_Circle_ from '../src/ol/style/Circle.js';
+import CircleStyle from '../src/ol/style/Circle.js';
 import Fill from '../src/ol/style/Fill.js';
 import Stroke from '../src/ol/style/Stroke.js';
 import Style from '../src/ol/style/Style.js';
@@ -19,7 +19,7 @@ var redLayer = new VectorLayer({
     features: [new Feature(new Point([0, 0]))]
   }),
   style: new Style({
-    image: new _ol_style_Circle_({
+    image: new CircleStyle({
       fill: new Fill({
         color: 'rgba(255,0,0,0.8)'
       }),
@@ -37,7 +37,7 @@ var greenLayer = new VectorLayer({
     features: [new Feature(new Point([250, 433.013]))]
   }),
   style: new Style({
-    image: new _ol_style_Circle_({
+    image: new CircleStyle({
       fill: new Fill({
         color: 'rgba(0,255,0,0.8)'
       }),
@@ -54,7 +54,7 @@ var blueLayer = new VectorLayer({
     features: [new Feature(new Point([500, 0]))]
   }),
   style: new Style({
-    image: new _ol_style_Circle_({
+    image: new CircleStyle({
       fill: new Fill({
         color: 'rgba(0,0,255,0.8)'
       }),
diff --git a/examples/center.js b/examples/center.js
index 2bce5d3093..f63b37e2de 100644
--- a/examples/center.js
+++ b/examples/center.js
@@ -6,7 +6,7 @@ import TileLayer from '../src/ol/layer/Tile.js';
 import VectorLayer from '../src/ol/layer/Vector.js';
 import OSM from '../src/ol/source/OSM.js';
 import VectorSource from '../src/ol/source/Vector.js';
-import _ol_style_Circle_ from '../src/ol/style/Circle.js';
+import CircleStyle from '../src/ol/style/Circle.js';
 import Fill from '../src/ol/style/Fill.js';
 import Stroke from '../src/ol/style/Stroke.js';
 import Style from '../src/ol/style/Style.js';
@@ -23,7 +23,7 @@ var style = new Style({
     color: '#319FD3',
     width: 1
   }),
-  image: new _ol_style_Circle_({
+  image: new CircleStyle({
     radius: 5,
     fill: new Fill({
       color: 'rgba(255, 255, 255, 0.6)'
diff --git a/examples/cluster.js b/examples/cluster.js
index bd95ecda01..8016547cad 100644
--- a/examples/cluster.js
+++ b/examples/cluster.js
@@ -7,7 +7,7 @@ import VectorLayer from '../src/ol/layer/Vector.js';
 import Cluster from '../src/ol/source/Cluster.js';
 import OSM from '../src/ol/source/OSM.js';
 import VectorSource from '../src/ol/source/Vector.js';
-import _ol_style_Circle_ from '../src/ol/style/Circle.js';
+import CircleStyle from '../src/ol/style/Circle.js';
 import Fill from '../src/ol/style/Fill.js';
 import Stroke from '../src/ol/style/Stroke.js';
 import Style from '../src/ol/style/Style.js';
@@ -41,7 +41,7 @@ var clusters = new VectorLayer({
     var style = styleCache[size];
     if (!style) {
       style = new Style({
-        image: new _ol_style_Circle_({
+        image: new CircleStyle({
           radius: 10,
           stroke: new Stroke({
             color: '#fff'
diff --git a/examples/drag-and-drop-image-vector.js b/examples/drag-and-drop-image-vector.js
index 0de0a04861..4678ffbee0 100644
--- a/examples/drag-and-drop-image-vector.js
+++ b/examples/drag-and-drop-image-vector.js
@@ -11,7 +11,7 @@ import VectorLayer from '../src/ol/layer/Vector.js';
 import TileLayer from '../src/ol/layer/Tile.js';
 import BingMaps from '../src/ol/source/BingMaps.js';
 import VectorSource from '../src/ol/source/Vector.js';
-import _ol_style_Circle_ from '../src/ol/style/Circle.js';
+import CircleStyle from '../src/ol/style/Circle.js';
 import Fill from '../src/ol/style/Fill.js';
 import Stroke from '../src/ol/style/Stroke.js';
 import Style from '../src/ol/style/Style.js';
@@ -19,7 +19,7 @@ import Style from '../src/ol/style/Style.js';
 
 var defaultStyle = {
   'Point': new Style({
-    image: new _ol_style_Circle_({
+    image: new CircleStyle({
       fill: new Fill({
         color: 'rgba(255,255,0,0.5)'
       }),
@@ -46,7 +46,7 @@ var defaultStyle = {
     })
   }),
   'MultiPoint': new Style({
-    image: new _ol_style_Circle_({
+    image: new CircleStyle({
       fill: new Fill({
         color: 'rgba(255,0,255,0.5)'
       }),
diff --git a/examples/drag-and-drop.js b/examples/drag-and-drop.js
index 86fd5b0d21..4bfdd07686 100644
--- a/examples/drag-and-drop.js
+++ b/examples/drag-and-drop.js
@@ -11,7 +11,7 @@ import TileLayer from '../src/ol/layer/Tile.js';
 import VectorLayer from '../src/ol/layer/Vector.js';
 import BingMaps from '../src/ol/source/BingMaps.js';
 import VectorSource from '../src/ol/source/Vector.js';
-import _ol_style_Circle_ from '../src/ol/style/Circle.js';
+import CircleStyle from '../src/ol/style/Circle.js';
 import Fill from '../src/ol/style/Fill.js';
 import Stroke from '../src/ol/style/Stroke.js';
 import Style from '../src/ol/style/Style.js';
@@ -19,7 +19,7 @@ import Style from '../src/ol/style/Style.js';
 
 var defaultStyle = {
   'Point': new Style({
-    image: new _ol_style_Circle_({
+    image: new CircleStyle({
       fill: new Fill({
         color: 'rgba(255,255,0,0.5)'
       }),
@@ -46,7 +46,7 @@ var defaultStyle = {
     })
   }),
   'MultiPoint': new Style({
-    image: new _ol_style_Circle_({
+    image: new CircleStyle({
       fill: new Fill({
         color: 'rgba(255,0,255,0.5)'
       }),
diff --git a/examples/draw-and-modify-features.js b/examples/draw-and-modify-features.js
index 4ce15fcac4..19cab51e58 100644
--- a/examples/draw-and-modify-features.js
+++ b/examples/draw-and-modify-features.js
@@ -7,7 +7,7 @@ import TileLayer from '../src/ol/layer/Tile.js';
 import VectorLayer from '../src/ol/layer/Vector.js';
 import OSM from '../src/ol/source/OSM.js';
 import VectorSource from '../src/ol/source/Vector.js';
-import _ol_style_Circle_ from '../src/ol/style/Circle.js';
+import CircleStyle from '../src/ol/style/Circle.js';
 import Fill from '../src/ol/style/Fill.js';
 import Stroke from '../src/ol/style/Stroke.js';
 import Style from '../src/ol/style/Style.js';
@@ -27,7 +27,7 @@ var vector = new VectorLayer({
       color: '#ffcc33',
       width: 2
     }),
-    image: new _ol_style_Circle_({
+    image: new CircleStyle({
       radius: 7,
       fill: new Fill({
         color: '#ffcc33'
diff --git a/examples/dynamic-data.js b/examples/dynamic-data.js
index d6857adce4..320aec8bb1 100644
--- a/examples/dynamic-data.js
+++ b/examples/dynamic-data.js
@@ -4,7 +4,7 @@ import MultiPoint from '../src/ol/geom/MultiPoint.js';
 import Point from '../src/ol/geom/Point.js';
 import TileLayer from '../src/ol/layer/Tile.js';
 import OSM from '../src/ol/source/OSM.js';
-import _ol_style_Circle_ from '../src/ol/style/Circle.js';
+import CircleStyle from '../src/ol/style/Circle.js';
 import Fill from '../src/ol/style/Fill.js';
 import Stroke from '../src/ol/style/Stroke.js';
 import Style from '../src/ol/style/Style.js';
@@ -24,7 +24,7 @@ var map = new Map({
 });
 
 var imageStyle = new Style({
-  image: new _ol_style_Circle_({
+  image: new CircleStyle({
     radius: 5,
     snapToPixel: false,
     fill: new Fill({color: 'yellow'}),
@@ -33,7 +33,7 @@ var imageStyle = new Style({
 });
 
 var headInnerImageStyle = new Style({
-  image: new _ol_style_Circle_({
+  image: new CircleStyle({
     radius: 2,
     snapToPixel: false,
     fill: new Fill({color: 'blue'})
@@ -41,7 +41,7 @@ var headInnerImageStyle = new Style({
 });
 
 var headOuterImageStyle = new Style({
-  image: new _ol_style_Circle_({
+  image: new CircleStyle({
     radius: 5,
     snapToPixel: false,
     fill: new Fill({color: 'black'})
diff --git a/examples/earthquake-clusters.js b/examples/earthquake-clusters.js
index 2afa0de9ee..c6131c996a 100644
--- a/examples/earthquake-clusters.js
+++ b/examples/earthquake-clusters.js
@@ -9,7 +9,7 @@ import VectorLayer from '../src/ol/layer/Vector.js';
 import Cluster from '../src/ol/source/Cluster.js';
 import Stamen from '../src/ol/source/Stamen.js';
 import VectorSource from '../src/ol/source/Vector.js';
-import _ol_style_Circle_ from '../src/ol/style/Circle.js';
+import CircleStyle from '../src/ol/style/Circle.js';
 import Fill from '../src/ol/style/Fill.js';
 import RegularShape from '../src/ol/style/RegularShape.js';
 import Stroke from '../src/ol/style/Stroke.js';
@@ -86,7 +86,7 @@ function styleFunction(feature, resolution) {
   var size = feature.get('features').length;
   if (size > 1) {
     style = new Style({
-      image: new _ol_style_Circle_({
+      image: new CircleStyle({
         radius: feature.get('radius'),
         fill: new Fill({
           color: [255, 153, 0, Math.min(0.8, 0.4 + (size / maxFeatureCount))]
@@ -107,7 +107,7 @@ function styleFunction(feature, resolution) {
 
 function selectStyleFunction(feature) {
   var styles = [new Style({
-    image: new _ol_style_Circle_({
+    image: new CircleStyle({
       radius: feature.get('radius'),
       fill: invisibleFill
     })
diff --git a/examples/feature-animation.js b/examples/feature-animation.js
index aef9b4ef19..442e971df2 100644
--- a/examples/feature-animation.js
+++ b/examples/feature-animation.js
@@ -10,7 +10,7 @@ import VectorLayer from '../src/ol/layer/Vector.js';
 import {fromLonLat} from '../src/ol/proj.js';
 import OSM from '../src/ol/source/OSM.js';
 import VectorSource from '../src/ol/source/Vector.js';
-import _ol_style_Circle_ from '../src/ol/style/Circle.js';
+import CircleStyle from '../src/ol/style/Circle.js';
 import Stroke from '../src/ol/style/Stroke.js';
 import Style from '../src/ol/style/Style.js';
 
@@ -67,7 +67,7 @@ function flash(feature) {
     var opacity = easeOut(1 - elapsedRatio);
 
     var style = new Style({
-      image: new _ol_style_Circle_({
+      image: new CircleStyle({
         radius: radius,
         snapToPixel: false,
         stroke: new Stroke({
diff --git a/examples/feature-move-animation.js b/examples/feature-move-animation.js
index 2d9d74199d..fd34c697c1 100644
--- a/examples/feature-move-animation.js
+++ b/examples/feature-move-animation.js
@@ -7,7 +7,7 @@ import TileLayer from '../src/ol/layer/Tile.js';
 import VectorLayer from '../src/ol/layer/Vector.js';
 import BingMaps from '../src/ol/source/BingMaps.js';
 import VectorSource from '../src/ol/source/Vector.js';
-import _ol_style_Circle_ from '../src/ol/style/Circle.js';
+import CircleStyle from '../src/ol/style/Circle.js';
 import Fill from '../src/ol/style/Fill.js';
 import Icon from '../src/ol/style/Icon.js';
 import Stroke from '../src/ol/style/Stroke.js';
@@ -97,7 +97,7 @@ var styles = {
     })
   }),
   'geoMarker': new Style({
-    image: new _ol_style_Circle_({
+    image: new CircleStyle({
       radius: 7,
       snapToPixel: false,
       fill: new Fill({color: 'black'}),
diff --git a/examples/geojson.js b/examples/geojson.js
index 58af905194..fa497be054 100644
--- a/examples/geojson.js
+++ b/examples/geojson.js
@@ -8,13 +8,13 @@ import TileLayer from '../src/ol/layer/Tile.js';
 import VectorLayer from '../src/ol/layer/Vector.js';
 import OSM from '../src/ol/source/OSM.js';
 import VectorSource from '../src/ol/source/Vector.js';
-import _ol_style_Circle_ from '../src/ol/style/Circle.js';
+import CircleStyle from '../src/ol/style/Circle.js';
 import Fill from '../src/ol/style/Fill.js';
 import Stroke from '../src/ol/style/Stroke.js';
 import Style from '../src/ol/style/Style.js';
 
 
-var image = new _ol_style_Circle_({
+var image = new CircleStyle({
   radius: 5,
   fill: null,
   stroke: new Stroke({color: 'red', width: 1})
@@ -66,7 +66,7 @@ var styles = {
     fill: new Fill({
       color: 'magenta'
     }),
-    image: new _ol_style_Circle_({
+    image: new CircleStyle({
       radius: 10,
       fill: null,
       stroke: new Stroke({
diff --git a/examples/geolocation.js b/examples/geolocation.js
index 782323b316..0df94b6ef1 100644
--- a/examples/geolocation.js
+++ b/examples/geolocation.js
@@ -8,7 +8,7 @@ import TileLayer from '../src/ol/layer/Tile.js';
 import VectorLayer from '../src/ol/layer/Vector.js';
 import OSM from '../src/ol/source/OSM.js';
 import VectorSource from '../src/ol/source/Vector.js';
-import _ol_style_Circle_ from '../src/ol/style/Circle.js';
+import CircleStyle from '../src/ol/style/Circle.js';
 import Fill from '../src/ol/style/Fill.js';
 import Stroke from '../src/ol/style/Stroke.js';
 import Style from '../src/ol/style/Style.js';
@@ -68,7 +68,7 @@ geolocation.on('change:accuracyGeometry', function() {
 
 var positionFeature = new Feature();
 positionFeature.setStyle(new Style({
-  image: new _ol_style_Circle_({
+  image: new CircleStyle({
     radius: 6,
     fill: new Fill({
       color: '#3399CC'
diff --git a/examples/gpx.js b/examples/gpx.js
index dfc5652d69..2861e70c84 100644
--- a/examples/gpx.js
+++ b/examples/gpx.js
@@ -5,7 +5,7 @@ import TileLayer from '../src/ol/layer/Tile.js';
 import VectorLayer from '../src/ol/layer/Vector.js';
 import BingMaps from '../src/ol/source/BingMaps.js';
 import VectorSource from '../src/ol/source/Vector.js';
-import _ol_style_Circle_ from '../src/ol/style/Circle.js';
+import CircleStyle from '../src/ol/style/Circle.js';
 import Fill from '../src/ol/style/Fill.js';
 import Stroke from '../src/ol/style/Stroke.js';
 import Style from '../src/ol/style/Style.js';
@@ -19,7 +19,7 @@ var raster = new TileLayer({
 
 var style = {
   'Point': new Style({
-    image: new _ol_style_Circle_({
+    image: new CircleStyle({
       fill: new Fill({
         color: 'rgba(255,255,0,0.4)'
       }),
diff --git a/examples/igc.js b/examples/igc.js
index fab2738d6a..2e42f2e9ae 100644
--- a/examples/igc.js
+++ b/examples/igc.js
@@ -9,7 +9,7 @@ import TileLayer from '../src/ol/layer/Tile.js';
 import VectorLayer from '../src/ol/layer/Vector.js';
 import OSM from '../src/ol/source/OSM.js';
 import VectorSource from '../src/ol/source/Vector.js';
-import _ol_style_Circle_ from '../src/ol/style/Circle.js';
+import CircleStyle from '../src/ol/style/Circle.js';
 import Fill from '../src/ol/style/Fill.js';
 import Stroke from '../src/ol/style/Stroke.js';
 import Style from '../src/ol/style/Style.js';
@@ -158,7 +158,7 @@ var stroke = new Stroke({
 });
 var style = new Style({
   stroke: stroke,
-  image: new _ol_style_Circle_({
+  image: new CircleStyle({
     radius: 5,
     fill: null,
     stroke: stroke
@@ -179,7 +179,7 @@ var featureOverlay = new VectorLayer({
   source: new VectorSource(),
   map: map,
   style: new Style({
-    image: new _ol_style_Circle_({
+    image: new CircleStyle({
       radius: 5,
       fill: new Fill({
         color: 'rgba(255,0,0,0.9)'
diff --git a/examples/kml-earthquakes.js b/examples/kml-earthquakes.js
index 621eb845e4..e785399ae0 100644
--- a/examples/kml-earthquakes.js
+++ b/examples/kml-earthquakes.js
@@ -5,7 +5,7 @@ import TileLayer from '../src/ol/layer/Tile.js';
 import VectorLayer from '../src/ol/layer/Vector.js';
 import Stamen from '../src/ol/source/Stamen.js';
 import VectorSource from '../src/ol/source/Vector.js';
-import _ol_style_Circle_ from '../src/ol/style/Circle.js';
+import CircleStyle from '../src/ol/style/Circle.js';
 import Fill from '../src/ol/style/Fill.js';
 import Stroke from '../src/ol/style/Stroke.js';
 import Style from '../src/ol/style/Style.js';
@@ -22,7 +22,7 @@ var styleFunction = function(feature) {
   var style = styleCache[radius];
   if (!style) {
     style = new Style({
-      image: new _ol_style_Circle_({
+      image: new CircleStyle({
         radius: radius,
         fill: new Fill({
           color: 'rgba(255, 153, 0, 0.4)'
diff --git a/examples/measure.js b/examples/measure.js
index e42658c7d2..b829c289a9 100644
--- a/examples/measure.js
+++ b/examples/measure.js
@@ -10,7 +10,7 @@ import TileLayer from '../src/ol/layer/Tile.js';
 import VectorLayer from '../src/ol/layer/Vector.js';
 import OSM from '../src/ol/source/OSM.js';
 import VectorSource from '../src/ol/source/Vector.js';
-import _ol_style_Circle_ from '../src/ol/style/Circle.js';
+import CircleStyle from '../src/ol/style/Circle.js';
 import Fill from '../src/ol/style/Fill.js';
 import Stroke from '../src/ol/style/Stroke.js';
 import Style from '../src/ol/style/Style.js';
@@ -32,7 +32,7 @@ var vector = new VectorLayer({
       color: '#ffcc33',
       width: 2
     }),
-    image: new _ol_style_Circle_({
+    image: new CircleStyle({
       radius: 7,
       fill: new Fill({
         color: '#ffcc33'
@@ -189,7 +189,7 @@ function addInteraction() {
         lineDash: [10, 10],
         width: 2
       }),
-      image: new _ol_style_Circle_({
+      image: new CircleStyle({
         radius: 5,
         stroke: new Stroke({
           color: 'rgba(0, 0, 0, 0.7)'
diff --git a/examples/modify-test.js b/examples/modify-test.js
index 63bcc0a052..f6501c30c6 100644
--- a/examples/modify-test.js
+++ b/examples/modify-test.js
@@ -6,7 +6,7 @@ import Modify from '../src/ol/interaction/Modify.js';
 import Select from '../src/ol/interaction/Select.js';
 import VectorLayer from '../src/ol/layer/Vector.js';
 import VectorSource from '../src/ol/source/Vector.js';
-import _ol_style_Circle_ from '../src/ol/style/Circle.js';
+import CircleStyle from '../src/ol/style/Circle.js';
 import Fill from '../src/ol/style/Fill.js';
 import Stroke from '../src/ol/style/Stroke.js';
 import Style from '../src/ol/style/Style.js';
@@ -14,7 +14,7 @@ import Style from '../src/ol/style/Style.js';
 
 var styleFunction = (function() {
   var styles = {};
-  var image = new _ol_style_Circle_({
+  var image = new CircleStyle({
     radius: 5,
     fill: null,
     stroke: new Stroke({color: 'orange', width: 2})
@@ -194,7 +194,7 @@ var overlayStyle = (function() {
 
   styles['Point'] = [
     new Style({
-      image: new _ol_style_Circle_({
+      image: new CircleStyle({
         radius: 7,
         fill: new Fill({
           color: [0, 153, 255, 1]
diff --git a/examples/polygon-styles.js b/examples/polygon-styles.js
index 6a1d987316..3928e95afd 100644
--- a/examples/polygon-styles.js
+++ b/examples/polygon-styles.js
@@ -4,7 +4,7 @@ import GeoJSON from '../src/ol/format/GeoJSON.js';
 import MultiPoint from '../src/ol/geom/MultiPoint.js';
 import VectorLayer from '../src/ol/layer/Vector.js';
 import VectorSource from '../src/ol/source/Vector.js';
-import _ol_style_Circle_ from '../src/ol/style/Circle.js';
+import CircleStyle from '../src/ol/style/Circle.js';
 import Fill from '../src/ol/style/Fill.js';
 import Stroke from '../src/ol/style/Stroke.js';
 import Style from '../src/ol/style/Style.js';
@@ -27,7 +27,7 @@ var styles = [
     })
   }),
   new Style({
-    image: new _ol_style_Circle_({
+    image: new CircleStyle({
       radius: 5,
       fill: new Fill({
         color: 'orange'
diff --git a/examples/render-geometry.js b/examples/render-geometry.js
index 4a68f096e2..fc7d8450da 100644
--- a/examples/render-geometry.js
+++ b/examples/render-geometry.js
@@ -2,7 +2,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_render_ from '../src/ol/render.js';
-import _ol_style_Circle_ from '../src/ol/style/Circle.js';
+import CircleStyle from '../src/ol/style/Circle.js';
 import Fill from '../src/ol/style/Fill.js';
 import Stroke from '../src/ol/style/Stroke.js';
 import Style from '../src/ol/style/Style.js';
@@ -16,7 +16,7 @@ var stroke = new Stroke({color: 'black'});
 var style = new Style({
   fill: fill,
   stroke: stroke,
-  image: new _ol_style_Circle_({
+  image: new CircleStyle({
     radius: 10,
     fill: fill,
     stroke: stroke
diff --git a/examples/snap.js b/examples/snap.js
index b7ab4c0cb4..34131a79bb 100644
--- a/examples/snap.js
+++ b/examples/snap.js
@@ -8,7 +8,7 @@ import TileLayer from '../src/ol/layer/Tile.js';
 import VectorLayer from '../src/ol/layer/Vector.js';
 import OSM from '../src/ol/source/OSM.js';
 import VectorSource from '../src/ol/source/Vector.js';
-import _ol_style_Circle_ from '../src/ol/style/Circle.js';
+import CircleStyle from '../src/ol/style/Circle.js';
 import Fill from '../src/ol/style/Fill.js';
 import Stroke from '../src/ol/style/Stroke.js';
 import Style from '../src/ol/style/Style.js';
@@ -27,7 +27,7 @@ var vector = new VectorLayer({
       color: '#ffcc33',
       width: 2
     }),
-    image: new _ol_style_Circle_({
+    image: new CircleStyle({
       radius: 7,
       fill: new Fill({
         color: '#ffcc33'
diff --git a/examples/symbol-atlas-webgl.js b/examples/symbol-atlas-webgl.js
index 1e1153098d..ceaa52a172 100644
--- a/examples/symbol-atlas-webgl.js
+++ b/examples/symbol-atlas-webgl.js
@@ -5,7 +5,7 @@ import Point from '../src/ol/geom/Point.js';
 import VectorLayer from '../src/ol/layer/Vector.js';
 import VectorSource from '../src/ol/source/Vector.js';
 import AtlasManager from '../src/ol/style/AtlasManager.js';
-import _ol_style_Circle_ from '../src/ol/style/Circle.js';
+import CircleStyle from '../src/ol/style/Circle.js';
 import Fill from '../src/ol/style/Fill.js';
 import RegularShape from '../src/ol/style/RegularShape.js';
 import Stroke from '../src/ol/style/Stroke.js';
@@ -47,7 +47,7 @@ for (i = 0; i < symbolInfo.length; ++i) {
   var info = symbolInfo[i];
   for (j = 0; j < radiuses.length; ++j) {
     // circle symbol
-    symbols.push(new _ol_style_Circle_({
+    symbols.push(new CircleStyle({
       opacity: info.opacity,
       scale: info.scale,
       radius: radiuses[j],
diff --git a/examples/synthetic-points.js b/examples/synthetic-points.js
index 758cb73316..a26d956984 100644
--- a/examples/synthetic-points.js
+++ b/examples/synthetic-points.js
@@ -5,7 +5,7 @@ import LineString from '../src/ol/geom/LineString.js';
 import Point from '../src/ol/geom/Point.js';
 import VectorLayer from '../src/ol/layer/Vector.js';
 import VectorSource from '../src/ol/source/Vector.js';
-import _ol_style_Circle_ from '../src/ol/style/Circle.js';
+import CircleStyle from '../src/ol/style/Circle.js';
 import Fill from '../src/ol/style/Fill.js';
 import Stroke from '../src/ol/style/Stroke.js';
 import Style from '../src/ol/style/Style.js';
@@ -25,14 +25,14 @@ for (var i = 0; i < count; ++i) {
 
 var styles = {
   '10': new Style({
-    image: new _ol_style_Circle_({
+    image: new CircleStyle({
       radius: 5,
       fill: new Fill({color: '#666666'}),
       stroke: new Stroke({color: '#bada55', width: 1})
     })
   }),
   '20': new Style({
-    image: new _ol_style_Circle_({
+    image: new CircleStyle({
       radius: 10,
       fill: new Fill({color: '#666666'}),
       stroke: new Stroke({color: '#bada55', width: 1})
@@ -102,7 +102,7 @@ var stroke = new Stroke({
 });
 var style = new Style({
   stroke: stroke,
-  image: new _ol_style_Circle_({
+  image: new CircleStyle({
     radius: 10,
     stroke: stroke
   })
diff --git a/examples/topolis.js b/examples/topolis.js
index aae8664ce7..5358056cb3 100644
--- a/examples/topolis.js
+++ b/examples/topolis.js
@@ -16,7 +16,7 @@ import VectorSource from '../src/ol/source/Vector.js';
 import Style from '../src/ol/style/Style.js';
 import Stroke from '../src/ol/style/Stroke.js';
 import Fill from '../src/ol/style/Fill.js';
-import _ol_style_Circle_ from '../src/ol/style/Circle.js';
+import CircleStyle from '../src/ol/style/Circle.js';
 import Text from '../src/ol/style/Text.js';
 import MousePosition from '../src/ol/control/MousePosition.js';
 
@@ -29,7 +29,7 @@ var nodesLayer = new VectorLayer({
   source: nodes,
   style: function(f) {
     var style = new Style({
-      image: new _ol_style_Circle_({
+      image: new CircleStyle({
         radius: 8,
         fill: new Fill({color: 'rgba(255, 0, 0, 0.2)'}),
         stroke: new Stroke({color: 'red', width: 1})
diff --git a/examples/vector-labels.js b/examples/vector-labels.js
index d80fab0219..9b1858563f 100644
--- a/examples/vector-labels.js
+++ b/examples/vector-labels.js
@@ -5,7 +5,7 @@ import TileLayer from '../src/ol/layer/Tile.js';
 import VectorLayer from '../src/ol/layer/Vector.js';
 import OSM from '../src/ol/source/OSM.js';
 import VectorSource from '../src/ol/source/Vector.js';
-import _ol_style_Circle_ from '../src/ol/style/Circle.js';
+import CircleStyle from '../src/ol/style/Circle.js';
 import Fill from '../src/ol/style/Fill.js';
 import Stroke from '../src/ol/style/Stroke.js';
 import Style from '../src/ol/style/Style.js';
@@ -172,7 +172,7 @@ var vectorLines = new VectorLayer({
 // Points
 function pointStyleFunction(feature, resolution) {
   return new Style({
-    image: new _ol_style_Circle_({
+    image: new CircleStyle({
       radius: 10,
       fill: new Fill({color: 'rgba(255, 0, 0, 0.1)'}),
       stroke: new Stroke({color: 'red', width: 1})
diff --git a/examples/vector-osm.js b/examples/vector-osm.js
index dd5e923251..2026eee098 100644
--- a/examples/vector-osm.js
+++ b/examples/vector-osm.js
@@ -8,7 +8,7 @@ import _ol_loadingstrategy_ from '../src/ol/loadingstrategy.js';
 import {transformExtent} from '../src/ol/proj.js';
 import BingMaps from '../src/ol/source/BingMaps.js';
 import VectorSource from '../src/ol/source/Vector.js';
-import _ol_style_Circle_ from '../src/ol/style/Circle.js';
+import CircleStyle from '../src/ol/style/Circle.js';
 import Fill from '../src/ol/style/Fill.js';
 import Stroke from '../src/ol/style/Stroke.js';
 import Style from '../src/ol/style/Style.js';
@@ -66,7 +66,7 @@ var styles = {
   },
   'natural': {
     'tree': new Style({
-      image: new _ol_style_Circle_({
+      image: new CircleStyle({
         radius: 2,
         fill: new Fill({
           color: 'rgba(140, 208, 95, 1.0)'
diff --git a/src/ol/style/Circle.js b/src/ol/style/Circle.js
index a2d9215edb..992e8c3390 100644
--- a/src/ol/style/Circle.js
+++ b/src/ol/style/Circle.js
@@ -13,7 +13,7 @@ import RegularShape from '../style/RegularShape.js';
  * @extends {ol.style.RegularShape}
  * @api
  */
-var _ol_style_Circle_ = function(opt_options) {
+var CircleStyle = function(opt_options) {
 
   var options = opt_options || {};
 
@@ -28,7 +28,7 @@ var _ol_style_Circle_ = function(opt_options) {
 
 };
 
-inherits(_ol_style_Circle_, RegularShape);
+inherits(CircleStyle, RegularShape);
 
 
 /**
@@ -37,8 +37,8 @@ inherits(_ol_style_Circle_, RegularShape);
  * @override
  * @api
  */
-_ol_style_Circle_.prototype.clone = function() {
-  var style = new _ol_style_Circle_({
+CircleStyle.prototype.clone = function() {
+  var style = new CircleStyle({
     fill: this.getFill() ? this.getFill().clone() : undefined,
     stroke: this.getStroke() ? this.getStroke().clone() : undefined,
     radius: this.getRadius(),
@@ -57,8 +57,8 @@ _ol_style_Circle_.prototype.clone = function() {
  * @param {number} radius Circle radius.
  * @api
  */
-_ol_style_Circle_.prototype.setRadius = function(radius) {
+CircleStyle.prototype.setRadius = function(radius) {
   this.radius_ = radius;
   this.render_(this.atlasManager_);
 };
-export default _ol_style_Circle_;
+export default CircleStyle;
diff --git a/src/ol/style/Style.js b/src/ol/style/Style.js
index 44fb692856..ae33eb9d5d 100644
--- a/src/ol/style/Style.js
+++ b/src/ol/style/Style.js
@@ -3,7 +3,7 @@
  */
 import {assert} from '../asserts.js';
 import GeometryType from '../geom/GeometryType.js';
-import _ol_style_Circle_ from '../style/Circle.js';
+import CircleStyle from '../style/Circle.js';
 import Fill from '../style/Fill.js';
 import Stroke from '../style/Stroke.js';
 
@@ -331,7 +331,7 @@ Style.defaultFunction = function(feature, resolution) {
     });
     Style.default_ = [
       new Style({
-        image: new _ol_style_Circle_({
+        image: new CircleStyle({
           fill: fill,
           stroke: stroke,
           radius: 5
@@ -390,7 +390,7 @@ Style.createDefaultEditing = function() {
 
   styles[GeometryType.POINT] = [
     new Style({
-      image: new _ol_style_Circle_({
+      image: new CircleStyle({
         radius: width * 2,
         fill: new Fill({
           color: blue
diff --git a/test/rendering/ol/layer/tile.test.js b/test/rendering/ol/layer/tile.test.js
index be11e77268..d3b2c3783e 100644
--- a/test/rendering/ol/layer/tile.test.js
+++ b/test/rendering/ol/layer/tile.test.js
@@ -7,7 +7,7 @@ import _ol_obj_ from '../../../../src/ol/obj.js';
 import {transform} from '../../../../src/ol/proj.js';
 import TileImage from '../../../../src/ol/source/TileImage.js';
 import XYZ from '../../../../src/ol/source/XYZ.js';
-import _ol_style_Circle_ from '../../../../src/ol/style/Circle.js';
+import CircleStyle from '../../../../src/ol/style/Circle.js';
 import Fill from '../../../../src/ol/style/Fill.js';
 import Stroke from '../../../../src/ol/style/Stroke.js';
 import _ol_tilegrid_ from '../../../../src/ol/tilegrid.js';
@@ -278,7 +278,7 @@ describe('ol.rendering.layer.Tile', function() {
       });
       onAddLayer = function(evt) {
         evt.element.on('render', function(e) {
-          e.vectorContext.setImageStyle(new _ol_style_Circle_({
+          e.vectorContext.setImageStyle(new CircleStyle({
             radius: 5,
             snapToPixel: false,
             fill: new Fill({color: 'yellow'}),
diff --git a/test/rendering/ol/layer/vector.test.js b/test/rendering/ol/layer/vector.test.js
index 3a3ab5fa38..b8e2e35a52 100644
--- a/test/rendering/ol/layer/vector.test.js
+++ b/test/rendering/ol/layer/vector.test.js
@@ -8,7 +8,7 @@ import Point from '../../../../src/ol/geom/Point.js';
 import Polygon from '../../../../src/ol/geom/Polygon.js';
 import VectorLayer from '../../../../src/ol/layer/Vector.js';
 import VectorSource from '../../../../src/ol/source/Vector.js';
-import _ol_style_Circle_ from '../../../../src/ol/style/Circle.js';
+import CircleStyle from '../../../../src/ol/style/Circle.js';
 import Fill from '../../../../src/ol/style/Fill.js';
 import Stroke from '../../../../src/ol/style/Stroke.js';
 import Style from '../../../../src/ol/style/Style.js';
@@ -724,7 +724,7 @@ describe('ol.rendering.layer.Vector', function() {
       layer.setDeclutter(true);
       layer.setStyle(function(feature) {
         return new Style({
-          image: new _ol_style_Circle_({
+          image: new CircleStyle({
             radius: 15,
             stroke: new Stroke({
               color: 'blue'
@@ -764,7 +764,7 @@ describe('ol.rendering.layer.Vector', function() {
       layer.setDeclutter(true);
       layer.setStyle(function(feature) {
         return new Style({
-          image: new _ol_style_Circle_({
+          image: new CircleStyle({
             radius: 15,
             stroke: new Stroke({
               color: 'blue'
@@ -806,7 +806,7 @@ describe('ol.rendering.layer.Vector', function() {
       layer.setStyle(function(feature) {
         return new Style({
           zIndex: feature.get('zIndex'),
-          image: new _ol_style_Circle_({
+          image: new CircleStyle({
             radius: 15,
             stroke: new Stroke({
               color: 'blue'
@@ -844,7 +844,7 @@ describe('ol.rendering.layer.Vector', function() {
       layer.setDeclutter(true);
       layer.setStyle(function(feature) {
         return new Style({
-          image: new _ol_style_Circle_({
+          image: new CircleStyle({
             radius: 5,
             stroke: new Stroke({
               color: 'blue'
@@ -874,7 +874,7 @@ describe('ol.rendering.layer.Vector', function() {
 
       var point = new Feature(new Point(center));
       point.setStyle(new Style({
-        image: new _ol_style_Circle_({
+        image: new CircleStyle({
           radius: 8,
           stroke: new Stroke({
             color: 'blue'
@@ -917,7 +917,7 @@ describe('ol.rendering.layer.Vector', function() {
 
       var point = new Feature(new Point(center));
       point.setStyle(new Style({
-        image: new _ol_style_Circle_({
+        image: new CircleStyle({
           radius: 8,
           stroke: new Stroke({
             color: 'blue'
@@ -961,7 +961,7 @@ describe('ol.rendering.layer.Vector', function() {
       var point = new Feature(new Point(center));
       point.setStyle(new Style({
         zIndex: 2,
-        image: new _ol_style_Circle_({
+        image: new CircleStyle({
           radius: 8,
           stroke: new Stroke({
             color: 'blue'
diff --git a/test/rendering/ol/layer/vectortile.test.js b/test/rendering/ol/layer/vectortile.test.js
index e7131335b1..afbf12b35a 100644
--- a/test/rendering/ol/layer/vectortile.test.js
+++ b/test/rendering/ol/layer/vectortile.test.js
@@ -8,7 +8,7 @@ import VectorTileLayer from '../../../../src/ol/layer/VectorTile.js';
 import _ol_obj_ from '../../../../src/ol/obj.js';
 import VectorSource from '../../../../src/ol/source/Vector.js';
 import VectorTileSource from '../../../../src/ol/source/VectorTile.js';
-import _ol_style_Circle_ from '../../../../src/ol/style/Circle.js';
+import CircleStyle from '../../../../src/ol/style/Circle.js';
 import Fill from '../../../../src/ol/style/Fill.js';
 import Style from '../../../../src/ol/style/Style.js';
 import Text from '../../../../src/ol/style/Text.js';
@@ -105,7 +105,7 @@ describe('ol.rendering.layer.VectorTile', function() {
         zIndex: 1,
         source: vectorSource,
         style: new Style({
-          image: new _ol_style_Circle_({
+          image: new CircleStyle({
             radius: 10,
             fill: new Fill({
               color: 'red'
@@ -144,7 +144,7 @@ describe('ol.rendering.layer.VectorTile', function() {
         var geom = feature.getGeometry();
         if (geom.getType() == 'Point') {
           return new Style({
-            image: new _ol_style_Circle_({
+            image: new CircleStyle({
               radius: 7,
               fill: new Fill({
                 color: 'red'
diff --git a/test/rendering/ol/render.test.js b/test/rendering/ol/render.test.js
index fe1efb4d40..7756e93ab0 100644
--- a/test/rendering/ol/render.test.js
+++ b/test/rendering/ol/render.test.js
@@ -4,7 +4,7 @@ import Polygon from '../../../src/ol/geom/Polygon.js';
 import _ol_render_ from '../../../src/ol/render.js';
 import VectorContext from '../../../src/ol/render/VectorContext.js';
 import CanvasImmediateRenderer from '../../../src/ol/render/canvas/Immediate.js';
-import _ol_style_Circle_ from '../../../src/ol/style/Circle.js';
+import CircleStyle from '../../../src/ol/style/Circle.js';
 import Fill from '../../../src/ol/style/Fill.js';
 import Stroke from '../../../src/ol/style/Stroke.js';
 import Style from '../../../src/ol/style/Style.js';
@@ -34,7 +34,7 @@ describe('ol.render', function() {
       });
 
       var style = new Style({
-        image: new _ol_style_Circle_({
+        image: new CircleStyle({
           fill: new Fill({
             color: 'green'
           }),
diff --git a/test/rendering/ol/style/circle.test.js b/test/rendering/ol/style/circle.test.js
index cc5416d109..97f042e3a8 100644
--- a/test/rendering/ol/style/circle.test.js
+++ b/test/rendering/ol/style/circle.test.js
@@ -5,7 +5,7 @@ import Map from '../../../../src/ol/Map.js';
 import View from '../../../../src/ol/View.js';
 import VectorLayer from '../../../../src/ol/layer/Vector.js';
 import VectorSource from '../../../../src/ol/source/Vector.js';
-import _ol_style_Circle_ from '../../../../src/ol/style/Circle.js';
+import CircleStyle from '../../../../src/ol/style/Circle.js';
 import Fill from '../../../../src/ol/style/Fill.js';
 import Style from '../../../../src/ol/style/Style.js';
 import Stroke from '../../../../src/ol/style/Stroke.js';
@@ -49,7 +49,7 @@ describe('ol.rendering.style.Circle', function() {
         geometry: multi ? new MultiPoint([[-20, 18]]) : new Point([-20, 18])
       });
       feature.setStyle(new Style({
-        image: new _ol_style_Circle_({
+        image: new CircleStyle({
           radius: 2,
           fill: new Fill({
             color: '#91E339'
@@ -62,7 +62,7 @@ describe('ol.rendering.style.Circle', function() {
         geometry: multi ? new MultiPoint([[-10, 18]]) : new Point([-10, 18])
       });
       feature.setStyle(new Style({
-        image: new _ol_style_Circle_({
+        image: new CircleStyle({
           radius: 4,
           fill: new Fill({
             color: '#5447E6'
@@ -75,7 +75,7 @@ describe('ol.rendering.style.Circle', function() {
         geometry: multi ? new MultiPoint([[4, 18]]) : new Point([4, 18])
       });
       feature.setStyle(new Style({
-        image: new _ol_style_Circle_({
+        image: new CircleStyle({
           radius: 6,
           fill: new Fill({
             color: '#92A8A6'
@@ -88,7 +88,7 @@ describe('ol.rendering.style.Circle', function() {
         geometry: multi ? new MultiPoint([[-20, 3]]) : new Point([-20, 3])
       });
       feature.setStyle(new Style({
-        image: new _ol_style_Circle_({
+        image: new CircleStyle({
           radius: 2,
           fill: new Fill({
             color: '#91E339'
@@ -105,7 +105,7 @@ describe('ol.rendering.style.Circle', function() {
         geometry: multi ? new MultiPoint([[-10, 3]]) : new Point([-10, 3])
       });
       feature.setStyle(new Style({
-        image: new _ol_style_Circle_({
+        image: new CircleStyle({
           radius: 4,
           fill: new Fill({
             color: '#5447E6'
@@ -122,7 +122,7 @@ describe('ol.rendering.style.Circle', function() {
         geometry: multi ? new MultiPoint([[4, 3]]) : new Point([4, 3])
       });
       feature.setStyle(new Style({
-        image: new _ol_style_Circle_({
+        image: new CircleStyle({
           radius: 6,
           fill: new Fill({
             color: '#92A8A6'
@@ -139,7 +139,7 @@ describe('ol.rendering.style.Circle', function() {
         geometry: multi ? new MultiPoint([[-20, -15]]) : new Point([-20, -15])
       });
       feature.setStyle(new Style({
-        image: new _ol_style_Circle_({
+        image: new CircleStyle({
           radius: 2,
           stroke: new Stroke({
             color: '#256308',
@@ -153,7 +153,7 @@ describe('ol.rendering.style.Circle', function() {
         geometry: multi ? new MultiPoint([[-10, -15]]) : new Point([-10, -15])
       });
       feature.setStyle(new Style({
-        image: new _ol_style_Circle_({
+        image: new CircleStyle({
           radius: 4,
           fill: new Fill({
             color: 'rgba(0, 0, 255, 0.3)'
@@ -170,7 +170,7 @@ describe('ol.rendering.style.Circle', function() {
         geometry: multi ? new MultiPoint([[4, -15]]) : new Point([4, -15])
       });
       feature.setStyle(new Style({
-        image: new _ol_style_Circle_({
+        image: new CircleStyle({
           radius: 6,
           fill: new Fill({
             color: 'rgba(235, 45, 70, 0.6)'
diff --git a/test/spec/ol/format/kml.test.js b/test/spec/ol/format/kml.test.js
index 40314fc547..52402f8e4e 100644
--- a/test/spec/ol/format/kml.test.js
+++ b/test/spec/ol/format/kml.test.js
@@ -13,7 +13,7 @@ import Polygon from '../../../../src/ol/geom/Polygon.js';
 import {addProjection, addCoordinateTransforms, transform, get as getProjection} from '../../../../src/ol/proj.js';
 import _ol_proj_Projection_ from '../../../../src/ol/proj/Projection.js';
 import {remove as removeTransform} from '../../../../src/ol/proj/transforms.js';
-import _ol_style_Circle_ from '../../../../src/ol/style/Circle.js';
+import CircleStyle from '../../../../src/ol/style/Circle.js';
 import Fill from '../../../../src/ol/style/Fill.js';
 import Icon from '../../../../src/ol/style/Icon.js';
 import IconAnchorUnits from '../../../../src/ol/style/IconAnchorUnits.js';
@@ -2335,7 +2335,7 @@ describe('ol.format.KML', function() {
 
         it('skips image styles that are not icon styles', function() {
           var style = new Style({
-            image: new _ol_style_Circle_({
+            image: new CircleStyle({
               radius: 4,
               fill: new Fill({
                 color: 'rgb(12, 34, 223)'
diff --git a/test/spec/ol/render/canvas/immediate.test.js b/test/spec/ol/render/canvas/immediate.test.js
index 1da35cc03e..8076239890 100644
--- a/test/spec/ol/render/canvas/immediate.test.js
+++ b/test/spec/ol/render/canvas/immediate.test.js
@@ -8,7 +8,7 @@ import Point from '../../../../../src/ol/geom/Point.js';
 import Polygon from '../../../../../src/ol/geom/Polygon.js';
 import VectorContext from '../../../../../src/ol/render/VectorContext.js';
 import CanvasImmediateRenderer from '../../../../../src/ol/render/canvas/Immediate.js';
-import _ol_style_Circle_ from '../../../../../src/ol/style/Circle.js';
+import CircleStyle from '../../../../../src/ol/style/Circle.js';
 import Fill from '../../../../../src/ol/style/Fill.js';
 import Stroke from '../../../../../src/ol/style/Stroke.js';
 import Style from '../../../../../src/ol/style/Style.js';
@@ -45,7 +45,7 @@ describe('ol.render.canvas.Immediate', function() {
       var fill = new Fill({});
       var stroke = new Stroke({});
       var text = new Text({});
-      var image = new _ol_style_Circle_({});
+      var image = new CircleStyle({});
       var style = new Style({
         fill: fill,
         stroke: stroke,
diff --git a/test/spec/ol/render/webgl/immediate.test.js b/test/spec/ol/render/webgl/immediate.test.js
index 3964cadb3e..149960f6bb 100644
--- a/test/spec/ol/render/webgl/immediate.test.js
+++ b/test/spec/ol/render/webgl/immediate.test.js
@@ -12,7 +12,7 @@ import _ol_render_webgl_ImageReplay_ from '../../../../../src/ol/render/webgl/Im
 import _ol_render_webgl_Immediate_ from '../../../../../src/ol/render/webgl/Immediate.js';
 import _ol_render_webgl_LineStringReplay_ from '../../../../../src/ol/render/webgl/LineStringReplay.js';
 import _ol_render_webgl_PolygonReplay_ from '../../../../../src/ol/render/webgl/PolygonReplay.js';
-import _ol_style_Circle_ from '../../../../../src/ol/style/Circle.js';
+import CircleStyle from '../../../../../src/ol/style/Circle.js';
 import Fill from '../../../../../src/ol/style/Fill.js';
 import Stroke from '../../../../../src/ol/style/Stroke.js';
 import Style from '../../../../../src/ol/style/Style.js';
@@ -22,7 +22,7 @@ describe('ol.render.webgl.Immediate', function() {
   beforeEach(function() {
     context = new _ol_render_webgl_Immediate_({}, [0, 0], 0, 0, [0, 0], [-180, -90, 180, 90], 1);
     style = new Style({
-      image: new _ol_style_Circle_(),
+      image: new CircleStyle(),
       fill: new Fill(),
       stroke: new Stroke()
     });
diff --git a/test/spec/ol/style/circle.test.js b/test/spec/ol/style/circle.test.js
index 114694b29c..be9c38647d 100644
--- a/test/spec/ol/style/circle.test.js
+++ b/test/spec/ol/style/circle.test.js
@@ -1,5 +1,5 @@
 import AtlasManager from '../../../../src/ol/style/AtlasManager.js';
-import _ol_style_Circle_ from '../../../../src/ol/style/Circle.js';
+import CircleStyle from '../../../../src/ol/style/Circle.js';
 import Fill from '../../../../src/ol/style/Fill.js';
 import Stroke from '../../../../src/ol/style/Stroke.js';
 
@@ -9,7 +9,7 @@ describe('ol.style.Circle', function() {
   describe('#constructor', function() {
 
     it('creates a canvas if no atlas is used (no fill-style)', function() {
-      var style = new _ol_style_Circle_({radius: 10});
+      var style = new CircleStyle({radius: 10});
       expect(style.getImage()).to.be.an(HTMLCanvasElement);
       expect(style.getSize()).to.eql([21, 21]);
       expect(style.getImageSize()).to.eql([21, 21]);
@@ -22,7 +22,7 @@ describe('ol.style.Circle', function() {
     });
 
     it('creates a canvas if no atlas is used (fill-style)', function() {
-      var style = new _ol_style_Circle_({
+      var style = new CircleStyle({
         radius: 10,
         fill: new Fill({
           color: '#FFFF00'
@@ -41,7 +41,7 @@ describe('ol.style.Circle', function() {
 
     it('adds itself to an atlas manager (no fill-style)', function() {
       var atlasManager = new AtlasManager({initialSize: 512});
-      var style = new _ol_style_Circle_({radius: 10, atlasManager: atlasManager});
+      var style = new CircleStyle({radius: 10, atlasManager: atlasManager});
       expect(style.getImage()).to.be.an(HTMLCanvasElement);
       expect(style.getSize()).to.eql([21, 21]);
       expect(style.getImageSize()).to.eql([512, 512]);
@@ -55,7 +55,7 @@ describe('ol.style.Circle', function() {
 
     it('adds itself to an atlas manager (fill-style)', function() {
       var atlasManager = new AtlasManager({initialSize: 512});
-      var style = new _ol_style_Circle_({
+      var style = new CircleStyle({
         radius: 10,
         atlasManager: atlasManager,
         fill: new Fill({
@@ -77,14 +77,14 @@ describe('ol.style.Circle', function() {
   describe('#clone', function() {
 
     it('creates a new ol.style.Circle', function() {
-      var original = new _ol_style_Circle_();
+      var original = new CircleStyle();
       var clone = original.clone();
-      expect(clone).to.be.an(_ol_style_Circle_);
+      expect(clone).to.be.an(CircleStyle);
       expect(clone).to.not.be(original);
     });
 
     it('copies all values', function() {
-      var original = new _ol_style_Circle_({
+      var original = new CircleStyle({
         fill: new Fill({
           color: '#319FD3'
         }),
@@ -106,7 +106,7 @@ describe('ol.style.Circle', function() {
     });
 
     it('the clone does not reference the same objects as the original', function() {
-      var original = new _ol_style_Circle_({
+      var original = new CircleStyle({
         fill: new Fill({
           color: '#319FD3'
         }),
@@ -129,37 +129,37 @@ describe('ol.style.Circle', function() {
   describe('#getChecksum', function() {
 
     it('calculates the same hash code for default options', function() {
-      var style1 = new _ol_style_Circle_();
-      var style2 = new _ol_style_Circle_();
+      var style1 = new CircleStyle();
+      var style2 = new CircleStyle();
       expect(style1.getChecksum()).to.eql(style2.getChecksum());
     });
 
     it('calculates not the same hash code (radius)', function() {
-      var style1 = new _ol_style_Circle_();
-      var style2 = new _ol_style_Circle_({
+      var style1 = new CircleStyle();
+      var style2 = new CircleStyle({
         radius: 5
       });
       expect(style1.getChecksum()).to.not.eql(style2.getChecksum());
     });
 
     it('calculates the same hash code (radius)', function() {
-      var style1 = new _ol_style_Circle_({
+      var style1 = new CircleStyle({
         radius: 5
       });
-      var style2 = new _ol_style_Circle_({
+      var style2 = new CircleStyle({
         radius: 5
       });
       expect(style1.getChecksum()).to.eql(style2.getChecksum());
     });
 
     it('calculates not the same hash code (color)', function() {
-      var style1 = new _ol_style_Circle_({
+      var style1 = new CircleStyle({
         radius: 5,
         fill: new Fill({
           color: '#319FD3'
         })
       });
-      var style2 = new _ol_style_Circle_({
+      var style2 = new CircleStyle({
         radius: 5,
         stroke: new Stroke({
           color: '#319FD3'
@@ -169,7 +169,7 @@ describe('ol.style.Circle', function() {
     });
 
     it('calculates the same hash code (everything set)', function() {
-      var style1 = new _ol_style_Circle_({
+      var style1 = new CircleStyle({
         radius: 5,
         fill: new Fill({
           color: '#319FD3'
@@ -183,7 +183,7 @@ describe('ol.style.Circle', function() {
           width: 2
         })
       });
-      var style2 = new _ol_style_Circle_({
+      var style2 = new CircleStyle({
         radius: 5,
         fill: new Fill({
           color: '#319FD3'
@@ -201,7 +201,7 @@ describe('ol.style.Circle', function() {
     });
 
     it('calculates not the same hash code (stroke width differs)', function() {
-      var style1 = new _ol_style_Circle_({
+      var style1 = new CircleStyle({
         radius: 5,
         fill: new Fill({
           color: '#319FD3'
@@ -215,7 +215,7 @@ describe('ol.style.Circle', function() {
           width: 3
         })
       });
-      var style2 = new _ol_style_Circle_({
+      var style2 = new CircleStyle({
         radius: 5,
         fill: new Fill({
           color: '#319FD3'
@@ -233,7 +233,7 @@ describe('ol.style.Circle', function() {
     });
 
     it('invalidates a cached checksum if values change (fill)', function() {
-      var style1 = new _ol_style_Circle_({
+      var style1 = new CircleStyle({
         radius: 5,
         fill: new Fill({
           color: '#319FD3'
@@ -242,7 +242,7 @@ describe('ol.style.Circle', function() {
           color: '#319FD3'
         })
       });
-      var style2 = new _ol_style_Circle_({
+      var style2 = new CircleStyle({
         radius: 5,
         fill: new Fill({
           color: '#319FD3'
@@ -258,7 +258,7 @@ describe('ol.style.Circle', function() {
     });
 
     it('invalidates a cached checksum if values change (stroke)', function() {
-      var style1 = new _ol_style_Circle_({
+      var style1 = new CircleStyle({
         radius: 5,
         fill: new Fill({
           color: '#319FD3'
@@ -267,7 +267,7 @@ describe('ol.style.Circle', function() {
           color: '#319FD3'
         })
       });
-      var style2 = new _ol_style_Circle_({
+      var style2 = new CircleStyle({
         radius: 5,
         fill: new Fill({
           color: '#319FD3'
@@ -286,7 +286,7 @@ describe('ol.style.Circle', function() {
 
   describe('#setRadius', function() {
     it('changes the circle radius', function() {
-      var style = new _ol_style_Circle_({
+      var style = new CircleStyle({
         radius: 10,
         fill: new Fill({
           color: '#FFFF00'
diff --git a/test/spec/ol/style/style.test.js b/test/spec/ol/style/style.test.js
index 23dd9a7f8f..a6e64e1465 100644
--- a/test/spec/ol/style/style.test.js
+++ b/test/spec/ol/style/style.test.js
@@ -2,7 +2,7 @@ import Feature from '../../../../src/ol/Feature.js';
 import Point from '../../../../src/ol/geom/Point.js';
 import Style from '../../../../src/ol/style/Style.js';
 import Fill from '../../../../src/ol/style/Fill.js';
-import _ol_style_Circle_ from '../../../../src/ol/style/Circle.js';
+import CircleStyle from '../../../../src/ol/style/Circle.js';
 import Stroke from '../../../../src/ol/style/Stroke.js';
 import Text from '../../../../src/ol/style/Text.js';
 
@@ -29,7 +29,7 @@ describe('ol.style.Style', function() {
     })
   });
 
-  var testImage = new _ol_style_Circle_({
+  var testImage = new CircleStyle({
     radius: 5
   });
 
@@ -48,7 +48,7 @@ describe('ol.style.Style', function() {
         fill: new Fill({
           color: '#319FD3'
         }),
-        image: new _ol_style_Circle_({
+        image: new CircleStyle({
           radius: 5
         }),
         stroke: new Stroke({
@@ -74,7 +74,7 @@ describe('ol.style.Style', function() {
         fill: new Fill({
           color: '#319FD3'
         }),
-        image: new _ol_style_Circle_({
+        image: new CircleStyle({
           radius: 5
         }),
         stroke: new Stroke({