diff --git a/src/ol/MapBrowserEvent.js b/src/ol/MapBrowserEvent.js
index 412d763dbc..13f6abb801 100644
--- a/src/ol/MapBrowserEvent.js
+++ b/src/ol/MapBrowserEvent.js
@@ -18,7 +18,7 @@ import MapEvent from './MapEvent.js';
  * @param {boolean=} opt_dragging Is the map currently being dragged?
  * @param {?olx.FrameState=} opt_frameState Frame state.
  */
-var _ol_MapBrowserEvent_ = function(type, map, browserEvent, opt_dragging,
+var MapBrowserEvent = function(type, map, browserEvent, opt_dragging,
     opt_frameState) {
 
   MapEvent.call(this, type, map, opt_frameState);
@@ -56,7 +56,7 @@ var _ol_MapBrowserEvent_ = function(type, map, browserEvent, opt_dragging,
 
 };
 
-inherits(_ol_MapBrowserEvent_, MapEvent);
+inherits(MapBrowserEvent, MapEvent);
 
 
 /**
@@ -65,7 +65,7 @@ inherits(_ol_MapBrowserEvent_, MapEvent);
  * @override
  * @api
  */
-_ol_MapBrowserEvent_.prototype.preventDefault = function() {
+MapBrowserEvent.prototype.preventDefault = function() {
   MapEvent.prototype.preventDefault.call(this);
   this.originalEvent.preventDefault();
 };
@@ -77,8 +77,8 @@ _ol_MapBrowserEvent_.prototype.preventDefault = function() {
  * @override
  * @api
  */
-_ol_MapBrowserEvent_.prototype.stopPropagation = function() {
+MapBrowserEvent.prototype.stopPropagation = function() {
   MapEvent.prototype.stopPropagation.call(this);
   this.originalEvent.stopPropagation();
 };
-export default _ol_MapBrowserEvent_;
+export default MapBrowserEvent;
diff --git a/src/ol/MapBrowserPointerEvent.js b/src/ol/MapBrowserPointerEvent.js
index e79bf013b9..8d1004364c 100644
--- a/src/ol/MapBrowserPointerEvent.js
+++ b/src/ol/MapBrowserPointerEvent.js
@@ -2,7 +2,7 @@
  * @module ol/MapBrowserPointerEvent
  */
 import {inherits} from './index.js';
-import _ol_MapBrowserEvent_ from './MapBrowserEvent.js';
+import MapBrowserEvent from './MapBrowserEvent.js';
 
 /**
  * @constructor
@@ -16,7 +16,7 @@ import _ol_MapBrowserEvent_ from './MapBrowserEvent.js';
 var _ol_MapBrowserPointerEvent_ = function(type, map, pointerEvent, opt_dragging,
     opt_frameState) {
 
-  _ol_MapBrowserEvent_.call(this, type, map, pointerEvent.originalEvent, opt_dragging,
+  MapBrowserEvent.call(this, type, map, pointerEvent.originalEvent, opt_dragging,
       opt_frameState);
 
   /**
@@ -27,5 +27,5 @@ var _ol_MapBrowserPointerEvent_ = function(type, map, pointerEvent, opt_dragging
 
 };
 
-inherits(_ol_MapBrowserPointerEvent_, _ol_MapBrowserEvent_);
+inherits(_ol_MapBrowserPointerEvent_, MapBrowserEvent);
 export default _ol_MapBrowserPointerEvent_;
diff --git a/src/ol/PluggableMap.js b/src/ol/PluggableMap.js
index 28e9a5435f..71bf9155f9 100644
--- a/src/ol/PluggableMap.js
+++ b/src/ol/PluggableMap.js
@@ -4,7 +4,7 @@
 import {getUid, inherits} from './index.js';
 import _ol_Collection_ from './Collection.js';
 import _ol_CollectionEventType_ from './CollectionEventType.js';
-import _ol_MapBrowserEvent_ from './MapBrowserEvent.js';
+import MapBrowserEvent from './MapBrowserEvent.js';
 import _ol_MapBrowserEventHandler_ from './MapBrowserEventHandler.js';
 import _ol_MapBrowserEventType_ from './MapBrowserEventType.js';
 import MapEvent from './MapEvent.js';
@@ -837,7 +837,7 @@ _ol_PluggableMap_.prototype.getTilePriority = function(tile, tileSourceKey, tile
  */
 _ol_PluggableMap_.prototype.handleBrowserEvent = function(browserEvent, opt_type) {
   var type = opt_type || browserEvent.type;
-  var mapBrowserEvent = new _ol_MapBrowserEvent_(type, this, browserEvent);
+  var mapBrowserEvent = new MapBrowserEvent(type, this, browserEvent);
   this.handleMapBrowserEvent(mapBrowserEvent);
 };
 
diff --git a/test/spec/ol/interaction/keyboardpan.test.js b/test/spec/ol/interaction/keyboardpan.test.js
index e5211b7fa6..3c77dc8b7f 100644
--- a/test/spec/ol/interaction/keyboardpan.test.js
+++ b/test/spec/ol/interaction/keyboardpan.test.js
@@ -1,5 +1,5 @@
 import _ol_Map_ from '../../../../src/ol/Map.js';
-import _ol_MapBrowserEvent_ from '../../../../src/ol/MapBrowserEvent.js';
+import MapBrowserEvent from '../../../../src/ol/MapBrowserEvent.js';
 import _ol_View_ from '../../../../src/ol/View.js';
 import Event from '../../../../src/ol/events/Event.js';
 import _ol_interaction_Interaction_ from '../../../../src/ol/interaction/Interaction.js';
@@ -24,7 +24,7 @@ describe('ol.interaction.KeyboardPan', function() {
   describe('handleEvent()', function() {
     it('pans on arrow keys', function() {
       var spy = sinon.spy(_ol_interaction_Interaction_, 'pan');
-      var event = new _ol_MapBrowserEvent_('keydown', map, {
+      var event = new MapBrowserEvent('keydown', map, {
         type: 'keydown',
         target: map.getTargetElement(),
         preventDefault: Event.prototype.preventDefault
diff --git a/test/spec/ol/interaction/keyboardzoom.test.js b/test/spec/ol/interaction/keyboardzoom.test.js
index f9c02b3a41..419db5b2d1 100644
--- a/test/spec/ol/interaction/keyboardzoom.test.js
+++ b/test/spec/ol/interaction/keyboardzoom.test.js
@@ -1,5 +1,5 @@
 import _ol_Map_ from '../../../../src/ol/Map.js';
-import _ol_MapBrowserEvent_ from '../../../../src/ol/MapBrowserEvent.js';
+import MapBrowserEvent from '../../../../src/ol/MapBrowserEvent.js';
 import _ol_View_ from '../../../../src/ol/View.js';
 import Event from '../../../../src/ol/events/Event.js';
 import _ol_interaction_Interaction_ from '../../../../src/ol/interaction/Interaction.js';
@@ -24,7 +24,7 @@ describe('ol.interaction.KeyboardZoom', function() {
   describe('handleEvent()', function() {
     it('zooms on + and - keys', function() {
       var spy = sinon.spy(_ol_interaction_Interaction_, 'zoomByDelta');
-      var event = new _ol_MapBrowserEvent_('keydown', map, {
+      var event = new MapBrowserEvent('keydown', map, {
         type: 'keydown',
         target: map.getTargetElement(),
         preventDefault: Event.prototype.preventDefault
diff --git a/test/spec/ol/interaction/mousewheelzoom.test.js b/test/spec/ol/interaction/mousewheelzoom.test.js
index 1838896066..befe7b491f 100644
--- a/test/spec/ol/interaction/mousewheelzoom.test.js
+++ b/test/spec/ol/interaction/mousewheelzoom.test.js
@@ -1,5 +1,5 @@
 import _ol_Map_ from '../../../../src/ol/Map.js';
-import _ol_MapBrowserEvent_ from '../../../../src/ol/MapBrowserEvent.js';
+import MapBrowserEvent from '../../../../src/ol/MapBrowserEvent.js';
 import _ol_View_ from '../../../../src/ol/View.js';
 import Event from '../../../../src/ol/events/Event.js';
 import _ol_has_ from '../../../../src/ol/has.js';
@@ -43,7 +43,7 @@ describe('ol.interaction.MouseWheelZoom', function() {
     });
 
     it('works with the defaut value', function(done) {
-      var event = new _ol_MapBrowserEvent_('mousewheel', map, {
+      var event = new MapBrowserEvent('mousewheel', map, {
         type: 'mousewheel',
         target: map.getViewport(),
         preventDefault: Event.prototype.preventDefault
@@ -70,7 +70,7 @@ describe('ol.interaction.MouseWheelZoom', function() {
         _ol_has_.FIREFOX = origHasFirefox;
         done();
       });
-      var event = new _ol_MapBrowserEvent_('wheel', map, {
+      var event = new MapBrowserEvent('wheel', map, {
         type: 'wheel',
         deltaMode: WheelEvent.DOM_DELTA_PIXEL,
         deltaY: _ol_has_.DEVICE_PIXEL_RATIO,
@@ -89,7 +89,7 @@ describe('ol.interaction.MouseWheelZoom', function() {
         _ol_has_.FIREFOX = origHasFirefox;
         done();
       });
-      var event = new _ol_MapBrowserEvent_('wheel', map, {
+      var event = new MapBrowserEvent('wheel', map, {
         type: 'wheel',
         deltaMode: WheelEvent.DOM_DELTA_PIXEL,
         deltaY: 1,
@@ -115,7 +115,7 @@ describe('ol.interaction.MouseWheelZoom', function() {
           expect(call.args[2]).to.eql([0, 0]);
           done();
         });
-        var event = new _ol_MapBrowserEvent_('wheel', map, {
+        var event = new MapBrowserEvent('wheel', map, {
           type: 'wheel',
           deltaMode: WheelEvent.DOM_DELTA_LINE,
           deltaY: 3.714599609375,
@@ -136,7 +136,7 @@ describe('ol.interaction.MouseWheelZoom', function() {
           _ol_has_.SAFARI = origHasSafari;
           done();
         });
-        var event = new _ol_MapBrowserEvent_('mousewheel', map, {
+        var event = new MapBrowserEvent('mousewheel', map, {
           type: 'mousewheel',
           wheelDeltaY: -50,
           target: map.getViewport(),
@@ -156,7 +156,7 @@ describe('ol.interaction.MouseWheelZoom', function() {
           _ol_has_.SAFARI = origHasSafari;
           done();
         });
-        var event = new _ol_MapBrowserEvent_('mousewheel', map, {
+        var event = new MapBrowserEvent('mousewheel', map, {
           type: 'mousewheel',
           wheelDeltaY: -120,
           target: map.getViewport(),