diff --git a/examples/wms-capabilities.js b/examples/wms-capabilities.js
index 5b673fe42e..53ab1cafc8 100644
--- a/examples/wms-capabilities.js
+++ b/examples/wms-capabilities.js
@@ -1,6 +1,6 @@
-import _ol_format_WMSCapabilities_ from '../src/ol/format/WMSCapabilities.js';
+import WMSCapabilities from '../src/ol/format/WMSCapabilities.js';
 
-var parser = new _ol_format_WMSCapabilities_();
+var parser = new WMSCapabilities();
 
 fetch('data/ogcsample.xml').then(function(response) {
   return response.text();
diff --git a/src/ol/format/WMSCapabilities.js b/src/ol/format/WMSCapabilities.js
index 91d850abca..79420bc5ed 100644
--- a/src/ol/format/WMSCapabilities.js
+++ b/src/ol/format/WMSCapabilities.js
@@ -15,7 +15,7 @@ import _ol_xml_ from '../xml.js';
  * @extends {ol.format.XML}
  * @api
  */
-var _ol_format_WMSCapabilities_ = function() {
+var WMSCapabilities = function() {
 
   _ol_format_XML_.call(this);
 
@@ -25,7 +25,7 @@ var _ol_format_WMSCapabilities_ = function() {
   this.version = undefined;
 };
 
-inherits(_ol_format_WMSCapabilities_, _ol_format_XML_);
+inherits(WMSCapabilities, _ol_format_XML_);
 
 
 /**
@@ -36,13 +36,13 @@ inherits(_ol_format_WMSCapabilities_, _ol_format_XML_);
  * @return {Object} An object representing the WMS capabilities.
  * @api
  */
-_ol_format_WMSCapabilities_.prototype.read;
+WMSCapabilities.prototype.read;
 
 
 /**
  * @inheritDoc
  */
-_ol_format_WMSCapabilities_.prototype.readFromDocument = function(doc) {
+WMSCapabilities.prototype.readFromDocument = function(doc) {
   for (var n = doc.firstChild; n; n = n.nextSibling) {
     if (n.nodeType == Node.ELEMENT_NODE) {
       return this.readFromNode(n);
@@ -55,11 +55,11 @@ _ol_format_WMSCapabilities_.prototype.readFromDocument = function(doc) {
 /**
  * @inheritDoc
  */
-_ol_format_WMSCapabilities_.prototype.readFromNode = function(node) {
+WMSCapabilities.prototype.readFromNode = function(node) {
   this.version = node.getAttribute('version').trim();
   var wmsCapabilityObject = _ol_xml_.pushParseAndPop({
     'version': this.version
-  }, _ol_format_WMSCapabilities_.PARSERS_, node, []);
+  }, WMSCapabilities.PARSERS_, node, []);
   return wmsCapabilityObject ? wmsCapabilityObject : null;
 };
 
@@ -70,9 +70,9 @@ _ol_format_WMSCapabilities_.prototype.readFromNode = function(node) {
  * @param {Array.<*>} objectStack Object stack.
  * @return {Object|undefined} Attribution object.
  */
-_ol_format_WMSCapabilities_.readAttribution_ = function(node, objectStack) {
+WMSCapabilities.readAttribution_ = function(node, objectStack) {
   return _ol_xml_.pushParseAndPop(
-      {}, _ol_format_WMSCapabilities_.ATTRIBUTION_PARSERS_, node, objectStack);
+      {}, WMSCapabilities.ATTRIBUTION_PARSERS_, node, objectStack);
 };
 
 
@@ -82,7 +82,7 @@ _ol_format_WMSCapabilities_.readAttribution_ = function(node, objectStack) {
  * @param {Array.<*>} objectStack Object stack.
  * @return {Object} Bounding box object.
  */
-_ol_format_WMSCapabilities_.readBoundingBox_ = function(node, objectStack) {
+WMSCapabilities.readBoundingBox_ = function(node, objectStack) {
   var extent = [
     _ol_format_XSD_.readDecimalString(node.getAttribute('minx')),
     _ol_format_XSD_.readDecimalString(node.getAttribute('miny')),
@@ -109,10 +109,10 @@ _ol_format_WMSCapabilities_.readBoundingBox_ = function(node, objectStack) {
  * @param {Array.<*>} objectStack Object stack.
  * @return {ol.Extent|undefined} Bounding box object.
  */
-_ol_format_WMSCapabilities_.readEXGeographicBoundingBox_ = function(node, objectStack) {
+WMSCapabilities.readEXGeographicBoundingBox_ = function(node, objectStack) {
   var geographicBoundingBox = _ol_xml_.pushParseAndPop(
       {},
-      _ol_format_WMSCapabilities_.EX_GEOGRAPHIC_BOUNDING_BOX_PARSERS_,
+      WMSCapabilities.EX_GEOGRAPHIC_BOUNDING_BOX_PARSERS_,
       node, objectStack);
   if (!geographicBoundingBox) {
     return undefined;
@@ -142,9 +142,9 @@ _ol_format_WMSCapabilities_.readEXGeographicBoundingBox_ = function(node, object
  * @private
  * @return {Object|undefined} Capability object.
  */
-_ol_format_WMSCapabilities_.readCapability_ = function(node, objectStack) {
+WMSCapabilities.readCapability_ = function(node, objectStack) {
   return _ol_xml_.pushParseAndPop(
-      {}, _ol_format_WMSCapabilities_.CAPABILITY_PARSERS_, node, objectStack);
+      {}, WMSCapabilities.CAPABILITY_PARSERS_, node, objectStack);
 };
 
 
@@ -154,9 +154,9 @@ _ol_format_WMSCapabilities_.readCapability_ = function(node, objectStack) {
  * @private
  * @return {Object|undefined} Service object.
  */
-_ol_format_WMSCapabilities_.readService_ = function(node, objectStack) {
+WMSCapabilities.readService_ = function(node, objectStack) {
   return _ol_xml_.pushParseAndPop(
-      {}, _ol_format_WMSCapabilities_.SERVICE_PARSERS_, node, objectStack);
+      {}, WMSCapabilities.SERVICE_PARSERS_, node, objectStack);
 };
 
 
@@ -166,9 +166,9 @@ _ol_format_WMSCapabilities_.readService_ = function(node, objectStack) {
  * @private
  * @return {Object|undefined} Contact information object.
  */
-_ol_format_WMSCapabilities_.readContactInformation_ = function(node, objectStack) {
+WMSCapabilities.readContactInformation_ = function(node, objectStack) {
   return _ol_xml_.pushParseAndPop(
-      {}, _ol_format_WMSCapabilities_.CONTACT_INFORMATION_PARSERS_,
+      {}, WMSCapabilities.CONTACT_INFORMATION_PARSERS_,
       node, objectStack);
 };
 
@@ -179,9 +179,9 @@ _ol_format_WMSCapabilities_.readContactInformation_ = function(node, objectStack
  * @private
  * @return {Object|undefined} Contact person object.
  */
-_ol_format_WMSCapabilities_.readContactPersonPrimary_ = function(node, objectStack) {
+WMSCapabilities.readContactPersonPrimary_ = function(node, objectStack) {
   return _ol_xml_.pushParseAndPop(
-      {}, _ol_format_WMSCapabilities_.CONTACT_PERSON_PARSERS_,
+      {}, WMSCapabilities.CONTACT_PERSON_PARSERS_,
       node, objectStack);
 };
 
@@ -192,9 +192,9 @@ _ol_format_WMSCapabilities_.readContactPersonPrimary_ = function(node, objectSta
  * @private
  * @return {Object|undefined} Contact address object.
  */
-_ol_format_WMSCapabilities_.readContactAddress_ = function(node, objectStack) {
+WMSCapabilities.readContactAddress_ = function(node, objectStack) {
   return _ol_xml_.pushParseAndPop(
-      {}, _ol_format_WMSCapabilities_.CONTACT_ADDRESS_PARSERS_,
+      {}, WMSCapabilities.CONTACT_ADDRESS_PARSERS_,
       node, objectStack);
 };
 
@@ -205,9 +205,9 @@ _ol_format_WMSCapabilities_.readContactAddress_ = function(node, objectStack) {
  * @private
  * @return {Array.<string>|undefined} Format array.
  */
-_ol_format_WMSCapabilities_.readException_ = function(node, objectStack) {
+WMSCapabilities.readException_ = function(node, objectStack) {
   return _ol_xml_.pushParseAndPop(
-      [], _ol_format_WMSCapabilities_.EXCEPTION_PARSERS_, node, objectStack);
+      [], WMSCapabilities.EXCEPTION_PARSERS_, node, objectStack);
 };
 
 
@@ -217,9 +217,9 @@ _ol_format_WMSCapabilities_.readException_ = function(node, objectStack) {
  * @private
  * @return {Object|undefined} Layer object.
  */
-_ol_format_WMSCapabilities_.readCapabilityLayer_ = function(node, objectStack) {
+WMSCapabilities.readCapabilityLayer_ = function(node, objectStack) {
   return _ol_xml_.pushParseAndPop(
-      {}, _ol_format_WMSCapabilities_.LAYER_PARSERS_, node, objectStack);
+      {}, WMSCapabilities.LAYER_PARSERS_, node, objectStack);
 };
 
 
@@ -229,12 +229,12 @@ _ol_format_WMSCapabilities_.readCapabilityLayer_ = function(node, objectStack) {
  * @param {Array.<*>} objectStack Object stack.
  * @return {Object|undefined} Layer object.
  */
-_ol_format_WMSCapabilities_.readLayer_ = function(node, objectStack) {
+WMSCapabilities.readLayer_ = function(node, objectStack) {
   var parentLayerObject = /**  @type {Object.<string,*>} */
         (objectStack[objectStack.length - 1]);
 
   var layerObject = _ol_xml_.pushParseAndPop(
-      {}, _ol_format_WMSCapabilities_.LAYER_PARSERS_, node, objectStack);
+      {}, WMSCapabilities.LAYER_PARSERS_, node, objectStack);
 
   if (!layerObject) {
     return undefined;
@@ -308,7 +308,7 @@ _ol_format_WMSCapabilities_.readLayer_ = function(node, objectStack) {
  * @param {Array.<*>} objectStack Object stack.
  * @return {Object} Dimension object.
  */
-_ol_format_WMSCapabilities_.readDimension_ = function(node, objectStack) {
+WMSCapabilities.readDimension_ = function(node, objectStack) {
   var dimensionObject = {
     'name': node.getAttribute('name'),
     'units': node.getAttribute('units'),
@@ -331,9 +331,9 @@ _ol_format_WMSCapabilities_.readDimension_ = function(node, objectStack) {
  * @param {Array.<*>} objectStack Object stack.
  * @return {Object|undefined} Online resource object.
  */
-_ol_format_WMSCapabilities_.readFormatOnlineresource_ = function(node, objectStack) {
+WMSCapabilities.readFormatOnlineresource_ = function(node, objectStack) {
   return _ol_xml_.pushParseAndPop(
-      {}, _ol_format_WMSCapabilities_.FORMAT_ONLINERESOURCE_PARSERS_,
+      {}, WMSCapabilities.FORMAT_ONLINERESOURCE_PARSERS_,
       node, objectStack);
 };
 
@@ -344,9 +344,9 @@ _ol_format_WMSCapabilities_.readFormatOnlineresource_ = function(node, objectSta
  * @param {Array.<*>} objectStack Object stack.
  * @return {Object|undefined} Request object.
  */
-_ol_format_WMSCapabilities_.readRequest_ = function(node, objectStack) {
+WMSCapabilities.readRequest_ = function(node, objectStack) {
   return _ol_xml_.pushParseAndPop(
-      {}, _ol_format_WMSCapabilities_.REQUEST_PARSERS_, node, objectStack);
+      {}, WMSCapabilities.REQUEST_PARSERS_, node, objectStack);
 };
 
 
@@ -356,9 +356,9 @@ _ol_format_WMSCapabilities_.readRequest_ = function(node, objectStack) {
  * @param {Array.<*>} objectStack Object stack.
  * @return {Object|undefined} DCP type object.
  */
-_ol_format_WMSCapabilities_.readDCPType_ = function(node, objectStack) {
+WMSCapabilities.readDCPType_ = function(node, objectStack) {
   return _ol_xml_.pushParseAndPop(
-      {}, _ol_format_WMSCapabilities_.DCPTYPE_PARSERS_, node, objectStack);
+      {}, WMSCapabilities.DCPTYPE_PARSERS_, node, objectStack);
 };
 
 
@@ -368,9 +368,9 @@ _ol_format_WMSCapabilities_.readDCPType_ = function(node, objectStack) {
  * @param {Array.<*>} objectStack Object stack.
  * @return {Object|undefined} HTTP object.
  */
-_ol_format_WMSCapabilities_.readHTTP_ = function(node, objectStack) {
+WMSCapabilities.readHTTP_ = function(node, objectStack) {
   return _ol_xml_.pushParseAndPop(
-      {}, _ol_format_WMSCapabilities_.HTTP_PARSERS_, node, objectStack);
+      {}, WMSCapabilities.HTTP_PARSERS_, node, objectStack);
 };
 
 
@@ -380,9 +380,9 @@ _ol_format_WMSCapabilities_.readHTTP_ = function(node, objectStack) {
  * @param {Array.<*>} objectStack Object stack.
  * @return {Object|undefined} Operation type object.
  */
-_ol_format_WMSCapabilities_.readOperationType_ = function(node, objectStack) {
+WMSCapabilities.readOperationType_ = function(node, objectStack) {
   return _ol_xml_.pushParseAndPop(
-      {}, _ol_format_WMSCapabilities_.OPERATIONTYPE_PARSERS_, node, objectStack);
+      {}, WMSCapabilities.OPERATIONTYPE_PARSERS_, node, objectStack);
 };
 
 
@@ -392,9 +392,9 @@ _ol_format_WMSCapabilities_.readOperationType_ = function(node, objectStack) {
  * @param {Array.<*>} objectStack Object stack.
  * @return {Object|undefined} Online resource object.
  */
-_ol_format_WMSCapabilities_.readSizedFormatOnlineresource_ = function(node, objectStack) {
+WMSCapabilities.readSizedFormatOnlineresource_ = function(node, objectStack) {
   var formatOnlineresource =
-        _ol_format_WMSCapabilities_.readFormatOnlineresource_(node, objectStack);
+        WMSCapabilities.readFormatOnlineresource_(node, objectStack);
   if (formatOnlineresource) {
     var size = [
       _ol_format_XSD_.readNonNegativeIntegerString(node.getAttribute('width')),
@@ -413,9 +413,9 @@ _ol_format_WMSCapabilities_.readSizedFormatOnlineresource_ = function(node, obje
  * @param {Array.<*>} objectStack Object stack.
  * @return {Object|undefined} Authority URL object.
  */
-_ol_format_WMSCapabilities_.readAuthorityURL_ = function(node, objectStack) {
+WMSCapabilities.readAuthorityURL_ = function(node, objectStack) {
   var authorityObject =
-        _ol_format_WMSCapabilities_.readFormatOnlineresource_(node, objectStack);
+        WMSCapabilities.readFormatOnlineresource_(node, objectStack);
   if (authorityObject) {
     authorityObject['name'] = node.getAttribute('name');
     return authorityObject;
@@ -430,9 +430,9 @@ _ol_format_WMSCapabilities_.readAuthorityURL_ = function(node, objectStack) {
  * @param {Array.<*>} objectStack Object stack.
  * @return {Object|undefined} Metadata URL object.
  */
-_ol_format_WMSCapabilities_.readMetadataURL_ = function(node, objectStack) {
+WMSCapabilities.readMetadataURL_ = function(node, objectStack) {
   var metadataObject =
-        _ol_format_WMSCapabilities_.readFormatOnlineresource_(node, objectStack);
+        WMSCapabilities.readFormatOnlineresource_(node, objectStack);
   if (metadataObject) {
     metadataObject['type'] = node.getAttribute('type');
     return metadataObject;
@@ -447,9 +447,9 @@ _ol_format_WMSCapabilities_.readMetadataURL_ = function(node, objectStack) {
  * @param {Array.<*>} objectStack Object stack.
  * @return {Object|undefined} Style object.
  */
-_ol_format_WMSCapabilities_.readStyle_ = function(node, objectStack) {
+WMSCapabilities.readStyle_ = function(node, objectStack) {
   return _ol_xml_.pushParseAndPop(
-      {}, _ol_format_WMSCapabilities_.STYLE_PARSERS_, node, objectStack);
+      {}, WMSCapabilities.STYLE_PARSERS_, node, objectStack);
 };
 
 
@@ -459,9 +459,9 @@ _ol_format_WMSCapabilities_.readStyle_ = function(node, objectStack) {
  * @param {Array.<*>} objectStack Object stack.
  * @return {Array.<string>|undefined} Keyword list.
  */
-_ol_format_WMSCapabilities_.readKeywordList_ = function(node, objectStack) {
+WMSCapabilities.readKeywordList_ = function(node, objectStack) {
   return _ol_xml_.pushParseAndPop(
-      [], _ol_format_WMSCapabilities_.KEYWORDLIST_PARSERS_, node, objectStack);
+      [], WMSCapabilities.KEYWORDLIST_PARSERS_, node, objectStack);
 };
 
 
@@ -470,7 +470,7 @@ _ol_format_WMSCapabilities_.readKeywordList_ = function(node, objectStack) {
  * @private
  * @type {Array.<string>}
  */
-_ol_format_WMSCapabilities_.NAMESPACE_URIS_ = [
+WMSCapabilities.NAMESPACE_URIS_ = [
   null,
   'http://www.opengis.net/wms'
 ];
@@ -481,12 +481,12 @@ _ol_format_WMSCapabilities_.NAMESPACE_URIS_ = [
  * @type {Object.<string, Object.<string, ol.XmlParser>>}
  * @private
  */
-_ol_format_WMSCapabilities_.PARSERS_ = _ol_xml_.makeStructureNS(
-    _ol_format_WMSCapabilities_.NAMESPACE_URIS_, {
+WMSCapabilities.PARSERS_ = _ol_xml_.makeStructureNS(
+    WMSCapabilities.NAMESPACE_URIS_, {
       'Service': _ol_xml_.makeObjectPropertySetter(
-          _ol_format_WMSCapabilities_.readService_),
+          WMSCapabilities.readService_),
       'Capability': _ol_xml_.makeObjectPropertySetter(
-          _ol_format_WMSCapabilities_.readCapability_)
+          WMSCapabilities.readCapability_)
     });
 
 
@@ -495,14 +495,14 @@ _ol_format_WMSCapabilities_.PARSERS_ = _ol_xml_.makeStructureNS(
  * @type {Object.<string, Object.<string, ol.XmlParser>>}
  * @private
  */
-_ol_format_WMSCapabilities_.CAPABILITY_PARSERS_ = _ol_xml_.makeStructureNS(
-    _ol_format_WMSCapabilities_.NAMESPACE_URIS_, {
+WMSCapabilities.CAPABILITY_PARSERS_ = _ol_xml_.makeStructureNS(
+    WMSCapabilities.NAMESPACE_URIS_, {
       'Request': _ol_xml_.makeObjectPropertySetter(
-          _ol_format_WMSCapabilities_.readRequest_),
+          WMSCapabilities.readRequest_),
       'Exception': _ol_xml_.makeObjectPropertySetter(
-          _ol_format_WMSCapabilities_.readException_),
+          WMSCapabilities.readException_),
       'Layer': _ol_xml_.makeObjectPropertySetter(
-          _ol_format_WMSCapabilities_.readCapabilityLayer_)
+          WMSCapabilities.readCapabilityLayer_)
     });
 
 
@@ -511,17 +511,17 @@ _ol_format_WMSCapabilities_.CAPABILITY_PARSERS_ = _ol_xml_.makeStructureNS(
  * @type {Object.<string, Object.<string, ol.XmlParser>>}
  * @private
  */
-_ol_format_WMSCapabilities_.SERVICE_PARSERS_ = _ol_xml_.makeStructureNS(
-    _ol_format_WMSCapabilities_.NAMESPACE_URIS_, {
+WMSCapabilities.SERVICE_PARSERS_ = _ol_xml_.makeStructureNS(
+    WMSCapabilities.NAMESPACE_URIS_, {
       'Name': _ol_xml_.makeObjectPropertySetter(_ol_format_XSD_.readString),
       'Title': _ol_xml_.makeObjectPropertySetter(_ol_format_XSD_.readString),
       'Abstract': _ol_xml_.makeObjectPropertySetter(_ol_format_XSD_.readString),
       'KeywordList': _ol_xml_.makeObjectPropertySetter(
-          _ol_format_WMSCapabilities_.readKeywordList_),
+          WMSCapabilities.readKeywordList_),
       'OnlineResource': _ol_xml_.makeObjectPropertySetter(
           _ol_format_XLink_.readHref),
       'ContactInformation': _ol_xml_.makeObjectPropertySetter(
-          _ol_format_WMSCapabilities_.readContactInformation_),
+          WMSCapabilities.readContactInformation_),
       'Fees': _ol_xml_.makeObjectPropertySetter(_ol_format_XSD_.readString),
       'AccessConstraints': _ol_xml_.makeObjectPropertySetter(
           _ol_format_XSD_.readString),
@@ -539,14 +539,14 @@ _ol_format_WMSCapabilities_.SERVICE_PARSERS_ = _ol_xml_.makeStructureNS(
  * @type {Object.<string, Object.<string, ol.XmlParser>>}
  * @private
  */
-_ol_format_WMSCapabilities_.CONTACT_INFORMATION_PARSERS_ = _ol_xml_.makeStructureNS(
-    _ol_format_WMSCapabilities_.NAMESPACE_URIS_, {
+WMSCapabilities.CONTACT_INFORMATION_PARSERS_ = _ol_xml_.makeStructureNS(
+    WMSCapabilities.NAMESPACE_URIS_, {
       'ContactPersonPrimary': _ol_xml_.makeObjectPropertySetter(
-          _ol_format_WMSCapabilities_.readContactPersonPrimary_),
+          WMSCapabilities.readContactPersonPrimary_),
       'ContactPosition': _ol_xml_.makeObjectPropertySetter(
           _ol_format_XSD_.readString),
       'ContactAddress': _ol_xml_.makeObjectPropertySetter(
-          _ol_format_WMSCapabilities_.readContactAddress_),
+          WMSCapabilities.readContactAddress_),
       'ContactVoiceTelephone': _ol_xml_.makeObjectPropertySetter(
           _ol_format_XSD_.readString),
       'ContactFacsimileTelephone': _ol_xml_.makeObjectPropertySetter(
@@ -561,8 +561,8 @@ _ol_format_WMSCapabilities_.CONTACT_INFORMATION_PARSERS_ = _ol_xml_.makeStructur
  * @type {Object.<string, Object.<string, ol.XmlParser>>}
  * @private
  */
-_ol_format_WMSCapabilities_.CONTACT_PERSON_PARSERS_ = _ol_xml_.makeStructureNS(
-    _ol_format_WMSCapabilities_.NAMESPACE_URIS_, {
+WMSCapabilities.CONTACT_PERSON_PARSERS_ = _ol_xml_.makeStructureNS(
+    WMSCapabilities.NAMESPACE_URIS_, {
       'ContactPerson': _ol_xml_.makeObjectPropertySetter(
           _ol_format_XSD_.readString),
       'ContactOrganization': _ol_xml_.makeObjectPropertySetter(
@@ -575,8 +575,8 @@ _ol_format_WMSCapabilities_.CONTACT_PERSON_PARSERS_ = _ol_xml_.makeStructureNS(
  * @type {Object.<string, Object.<string, ol.XmlParser>>}
  * @private
  */
-_ol_format_WMSCapabilities_.CONTACT_ADDRESS_PARSERS_ = _ol_xml_.makeStructureNS(
-    _ol_format_WMSCapabilities_.NAMESPACE_URIS_, {
+WMSCapabilities.CONTACT_ADDRESS_PARSERS_ = _ol_xml_.makeStructureNS(
+    WMSCapabilities.NAMESPACE_URIS_, {
       'AddressType': _ol_xml_.makeObjectPropertySetter(_ol_format_XSD_.readString),
       'Address': _ol_xml_.makeObjectPropertySetter(_ol_format_XSD_.readString),
       'City': _ol_xml_.makeObjectPropertySetter(_ol_format_XSD_.readString),
@@ -592,8 +592,8 @@ _ol_format_WMSCapabilities_.CONTACT_ADDRESS_PARSERS_ = _ol_xml_.makeStructureNS(
  * @type {Object.<string, Object.<string, ol.XmlParser>>}
  * @private
  */
-_ol_format_WMSCapabilities_.EXCEPTION_PARSERS_ = _ol_xml_.makeStructureNS(
-    _ol_format_WMSCapabilities_.NAMESPACE_URIS_, {
+WMSCapabilities.EXCEPTION_PARSERS_ = _ol_xml_.makeStructureNS(
+    WMSCapabilities.NAMESPACE_URIS_, {
       'Format': _ol_xml_.makeArrayPusher(_ol_format_XSD_.readString)
     });
 
@@ -603,39 +603,39 @@ _ol_format_WMSCapabilities_.EXCEPTION_PARSERS_ = _ol_xml_.makeStructureNS(
  * @type {Object.<string, Object.<string, ol.XmlParser>>}
  * @private
  */
-_ol_format_WMSCapabilities_.LAYER_PARSERS_ = _ol_xml_.makeStructureNS(
-    _ol_format_WMSCapabilities_.NAMESPACE_URIS_, {
+WMSCapabilities.LAYER_PARSERS_ = _ol_xml_.makeStructureNS(
+    WMSCapabilities.NAMESPACE_URIS_, {
       'Name': _ol_xml_.makeObjectPropertySetter(_ol_format_XSD_.readString),
       'Title': _ol_xml_.makeObjectPropertySetter(_ol_format_XSD_.readString),
       'Abstract': _ol_xml_.makeObjectPropertySetter(_ol_format_XSD_.readString),
       'KeywordList': _ol_xml_.makeObjectPropertySetter(
-          _ol_format_WMSCapabilities_.readKeywordList_),
+          WMSCapabilities.readKeywordList_),
       'CRS': _ol_xml_.makeObjectPropertyPusher(_ol_format_XSD_.readString),
       'EX_GeographicBoundingBox': _ol_xml_.makeObjectPropertySetter(
-          _ol_format_WMSCapabilities_.readEXGeographicBoundingBox_),
+          WMSCapabilities.readEXGeographicBoundingBox_),
       'BoundingBox': _ol_xml_.makeObjectPropertyPusher(
-          _ol_format_WMSCapabilities_.readBoundingBox_),
+          WMSCapabilities.readBoundingBox_),
       'Dimension': _ol_xml_.makeObjectPropertyPusher(
-          _ol_format_WMSCapabilities_.readDimension_),
+          WMSCapabilities.readDimension_),
       'Attribution': _ol_xml_.makeObjectPropertySetter(
-          _ol_format_WMSCapabilities_.readAttribution_),
+          WMSCapabilities.readAttribution_),
       'AuthorityURL': _ol_xml_.makeObjectPropertyPusher(
-          _ol_format_WMSCapabilities_.readAuthorityURL_),
+          WMSCapabilities.readAuthorityURL_),
       'Identifier': _ol_xml_.makeObjectPropertyPusher(_ol_format_XSD_.readString),
       'MetadataURL': _ol_xml_.makeObjectPropertyPusher(
-          _ol_format_WMSCapabilities_.readMetadataURL_),
+          WMSCapabilities.readMetadataURL_),
       'DataURL': _ol_xml_.makeObjectPropertyPusher(
-          _ol_format_WMSCapabilities_.readFormatOnlineresource_),
+          WMSCapabilities.readFormatOnlineresource_),
       'FeatureListURL': _ol_xml_.makeObjectPropertyPusher(
-          _ol_format_WMSCapabilities_.readFormatOnlineresource_),
+          WMSCapabilities.readFormatOnlineresource_),
       'Style': _ol_xml_.makeObjectPropertyPusher(
-          _ol_format_WMSCapabilities_.readStyle_),
+          WMSCapabilities.readStyle_),
       'MinScaleDenominator': _ol_xml_.makeObjectPropertySetter(
           _ol_format_XSD_.readDecimal),
       'MaxScaleDenominator': _ol_xml_.makeObjectPropertySetter(
           _ol_format_XSD_.readDecimal),
       'Layer': _ol_xml_.makeObjectPropertyPusher(
-          _ol_format_WMSCapabilities_.readLayer_)
+          WMSCapabilities.readLayer_)
     });
 
 
@@ -644,13 +644,13 @@ _ol_format_WMSCapabilities_.LAYER_PARSERS_ = _ol_xml_.makeStructureNS(
  * @type {Object.<string, Object.<string, ol.XmlParser>>}
  * @private
  */
-_ol_format_WMSCapabilities_.ATTRIBUTION_PARSERS_ = _ol_xml_.makeStructureNS(
-    _ol_format_WMSCapabilities_.NAMESPACE_URIS_, {
+WMSCapabilities.ATTRIBUTION_PARSERS_ = _ol_xml_.makeStructureNS(
+    WMSCapabilities.NAMESPACE_URIS_, {
       'Title': _ol_xml_.makeObjectPropertySetter(_ol_format_XSD_.readString),
       'OnlineResource': _ol_xml_.makeObjectPropertySetter(
           _ol_format_XLink_.readHref),
       'LogoURL': _ol_xml_.makeObjectPropertySetter(
-          _ol_format_WMSCapabilities_.readSizedFormatOnlineresource_)
+          WMSCapabilities.readSizedFormatOnlineresource_)
     });
 
 
@@ -659,8 +659,8 @@ _ol_format_WMSCapabilities_.ATTRIBUTION_PARSERS_ = _ol_xml_.makeStructureNS(
  * @type {Object.<string, Object.<string, ol.XmlParser>>}
  * @private
  */
-_ol_format_WMSCapabilities_.EX_GEOGRAPHIC_BOUNDING_BOX_PARSERS_ =
-    _ol_xml_.makeStructureNS(_ol_format_WMSCapabilities_.NAMESPACE_URIS_, {
+WMSCapabilities.EX_GEOGRAPHIC_BOUNDING_BOX_PARSERS_ =
+    _ol_xml_.makeStructureNS(WMSCapabilities.NAMESPACE_URIS_, {
       'westBoundLongitude': _ol_xml_.makeObjectPropertySetter(
           _ol_format_XSD_.readDecimal),
       'eastBoundLongitude': _ol_xml_.makeObjectPropertySetter(
@@ -677,14 +677,14 @@ _ol_format_WMSCapabilities_.EX_GEOGRAPHIC_BOUNDING_BOX_PARSERS_ =
  * @type {Object.<string, Object.<string, ol.XmlParser>>}
  * @private
  */
-_ol_format_WMSCapabilities_.REQUEST_PARSERS_ = _ol_xml_.makeStructureNS(
-    _ol_format_WMSCapabilities_.NAMESPACE_URIS_, {
+WMSCapabilities.REQUEST_PARSERS_ = _ol_xml_.makeStructureNS(
+    WMSCapabilities.NAMESPACE_URIS_, {
       'GetCapabilities': _ol_xml_.makeObjectPropertySetter(
-          _ol_format_WMSCapabilities_.readOperationType_),
+          WMSCapabilities.readOperationType_),
       'GetMap': _ol_xml_.makeObjectPropertySetter(
-          _ol_format_WMSCapabilities_.readOperationType_),
+          WMSCapabilities.readOperationType_),
       'GetFeatureInfo': _ol_xml_.makeObjectPropertySetter(
-          _ol_format_WMSCapabilities_.readOperationType_)
+          WMSCapabilities.readOperationType_)
     });
 
 
@@ -693,11 +693,11 @@ _ol_format_WMSCapabilities_.REQUEST_PARSERS_ = _ol_xml_.makeStructureNS(
  * @type {Object.<string, Object.<string, ol.XmlParser>>}
  * @private
  */
-_ol_format_WMSCapabilities_.OPERATIONTYPE_PARSERS_ = _ol_xml_.makeStructureNS(
-    _ol_format_WMSCapabilities_.NAMESPACE_URIS_, {
+WMSCapabilities.OPERATIONTYPE_PARSERS_ = _ol_xml_.makeStructureNS(
+    WMSCapabilities.NAMESPACE_URIS_, {
       'Format': _ol_xml_.makeObjectPropertyPusher(_ol_format_XSD_.readString),
       'DCPType': _ol_xml_.makeObjectPropertyPusher(
-          _ol_format_WMSCapabilities_.readDCPType_)
+          WMSCapabilities.readDCPType_)
     });
 
 
@@ -706,10 +706,10 @@ _ol_format_WMSCapabilities_.OPERATIONTYPE_PARSERS_ = _ol_xml_.makeStructureNS(
  * @type {Object.<string, Object.<string, ol.XmlParser>>}
  * @private
  */
-_ol_format_WMSCapabilities_.DCPTYPE_PARSERS_ = _ol_xml_.makeStructureNS(
-    _ol_format_WMSCapabilities_.NAMESPACE_URIS_, {
+WMSCapabilities.DCPTYPE_PARSERS_ = _ol_xml_.makeStructureNS(
+    WMSCapabilities.NAMESPACE_URIS_, {
       'HTTP': _ol_xml_.makeObjectPropertySetter(
-          _ol_format_WMSCapabilities_.readHTTP_)
+          WMSCapabilities.readHTTP_)
     });
 
 
@@ -718,12 +718,12 @@ _ol_format_WMSCapabilities_.DCPTYPE_PARSERS_ = _ol_xml_.makeStructureNS(
  * @type {Object.<string, Object.<string, ol.XmlParser>>}
  * @private
  */
-_ol_format_WMSCapabilities_.HTTP_PARSERS_ = _ol_xml_.makeStructureNS(
-    _ol_format_WMSCapabilities_.NAMESPACE_URIS_, {
+WMSCapabilities.HTTP_PARSERS_ = _ol_xml_.makeStructureNS(
+    WMSCapabilities.NAMESPACE_URIS_, {
       'Get': _ol_xml_.makeObjectPropertySetter(
-          _ol_format_WMSCapabilities_.readFormatOnlineresource_),
+          WMSCapabilities.readFormatOnlineresource_),
       'Post': _ol_xml_.makeObjectPropertySetter(
-          _ol_format_WMSCapabilities_.readFormatOnlineresource_)
+          WMSCapabilities.readFormatOnlineresource_)
     });
 
 
@@ -732,17 +732,17 @@ _ol_format_WMSCapabilities_.HTTP_PARSERS_ = _ol_xml_.makeStructureNS(
  * @type {Object.<string, Object.<string, ol.XmlParser>>}
  * @private
  */
-_ol_format_WMSCapabilities_.STYLE_PARSERS_ = _ol_xml_.makeStructureNS(
-    _ol_format_WMSCapabilities_.NAMESPACE_URIS_, {
+WMSCapabilities.STYLE_PARSERS_ = _ol_xml_.makeStructureNS(
+    WMSCapabilities.NAMESPACE_URIS_, {
       'Name': _ol_xml_.makeObjectPropertySetter(_ol_format_XSD_.readString),
       'Title': _ol_xml_.makeObjectPropertySetter(_ol_format_XSD_.readString),
       'Abstract': _ol_xml_.makeObjectPropertySetter(_ol_format_XSD_.readString),
       'LegendURL': _ol_xml_.makeObjectPropertyPusher(
-          _ol_format_WMSCapabilities_.readSizedFormatOnlineresource_),
+          WMSCapabilities.readSizedFormatOnlineresource_),
       'StyleSheetURL': _ol_xml_.makeObjectPropertySetter(
-          _ol_format_WMSCapabilities_.readFormatOnlineresource_),
+          WMSCapabilities.readFormatOnlineresource_),
       'StyleURL': _ol_xml_.makeObjectPropertySetter(
-          _ol_format_WMSCapabilities_.readFormatOnlineresource_)
+          WMSCapabilities.readFormatOnlineresource_)
     });
 
 
@@ -751,8 +751,8 @@ _ol_format_WMSCapabilities_.STYLE_PARSERS_ = _ol_xml_.makeStructureNS(
  * @type {Object.<string, Object.<string, ol.XmlParser>>}
  * @private
  */
-_ol_format_WMSCapabilities_.FORMAT_ONLINERESOURCE_PARSERS_ =
-    _ol_xml_.makeStructureNS(_ol_format_WMSCapabilities_.NAMESPACE_URIS_, {
+WMSCapabilities.FORMAT_ONLINERESOURCE_PARSERS_ =
+    _ol_xml_.makeStructureNS(WMSCapabilities.NAMESPACE_URIS_, {
       'Format': _ol_xml_.makeObjectPropertySetter(_ol_format_XSD_.readString),
       'OnlineResource': _ol_xml_.makeObjectPropertySetter(
           _ol_format_XLink_.readHref)
@@ -764,8 +764,8 @@ _ol_format_WMSCapabilities_.FORMAT_ONLINERESOURCE_PARSERS_ =
  * @type {Object.<string, Object.<string, ol.XmlParser>>}
  * @private
  */
-_ol_format_WMSCapabilities_.KEYWORDLIST_PARSERS_ = _ol_xml_.makeStructureNS(
-    _ol_format_WMSCapabilities_.NAMESPACE_URIS_, {
+WMSCapabilities.KEYWORDLIST_PARSERS_ = _ol_xml_.makeStructureNS(
+    WMSCapabilities.NAMESPACE_URIS_, {
       'Keyword': _ol_xml_.makeArrayPusher(_ol_format_XSD_.readString)
     });
-export default _ol_format_WMSCapabilities_;
+export default WMSCapabilities;
diff --git a/test/spec/ol/format/wmsgetfeatureinfo.test.js b/test/spec/ol/format/wmsgetfeatureinfo.test.js
index 755f64ce72..168e092a53 100644
--- a/test/spec/ol/format/wmsgetfeatureinfo.test.js
+++ b/test/spec/ol/format/wmsgetfeatureinfo.test.js
@@ -1,4 +1,4 @@
-import _ol_format_WMSGetFeatureInfo_ from '../../../../src/ol/format/WMSGetFeatureInfo.js';
+import WMSGetFeatureInfo from '../../../../src/ol/format/WMSGetFeatureInfo.js';
 import {addCommon, clearAllProjections} from '../../../../src/ol/proj.js';
 import {register} from '../../../../src/ol/proj/proj4.js';
 
@@ -8,12 +8,12 @@ describe('ol.format.WMSGetFeatureInfo', function() {
   describe('#getLayers', function() {
 
     it('returns null if layers is undefined', function() {
-      var format = new _ol_format_WMSGetFeatureInfo_();
+      var format = new WMSGetFeatureInfo();
       expect(format.getLayers()).to.be(null);
     });
 
     it('returns the value provided in the layers option', function() {
-      var format = new _ol_format_WMSGetFeatureInfo_({
+      var format = new WMSGetFeatureInfo({
         layers: ['a', 'z']
       });
       expect(format.getLayers()).to.eql(['a', 'z']);
@@ -32,7 +32,7 @@ describe('ol.format.WMSGetFeatureInfo', function() {
         register(proj4);
         afterLoadText('spec/ol/format/wms/getfeatureinfo.xml', function(data) {
           try {
-            features = new _ol_format_WMSGetFeatureInfo_().readFeatures(data);
+            features = new WMSGetFeatureInfo().readFeatures(data);
           } catch (e) {
             done(e);
           }
@@ -73,7 +73,7 @@ describe('ol.format.WMSGetFeatureInfo', function() {
             '  <AAA64_layer>' +
             '  </AAA64_layer>' +
             '</msGMLOutput>';
-        var features = new _ol_format_WMSGetFeatureInfo_().readFeatures(text);
+        var features = new WMSGetFeatureInfo().readFeatures(text);
         expect(features.length).to.be(0);
       });
 
@@ -98,7 +98,7 @@ describe('ol.format.WMSGetFeatureInfo', function() {
             '    </AAA64_feature>' +
             '  </AAA64_layer>' +
             '</msGMLOutput>';
-        var features = new _ol_format_WMSGetFeatureInfo_().readFeatures(text);
+        var features = new WMSGetFeatureInfo().readFeatures(text);
         expect(features.length).to.be(1);
         expect(features[0].get('FOO')).to.be('bar');
         // FIXME is that really wanted ?
@@ -158,7 +158,7 @@ describe('ol.format.WMSGetFeatureInfo', function() {
             '   </AAA62_feature>' +
             '  </AAA62_layer>' +
             '</msGMLOutput>';
-        var format = new _ol_format_WMSGetFeatureInfo_();
+        var format = new WMSGetFeatureInfo();
         var features = format.readFeatures(text);
         expect(features.length).to.be(2);
         expect(features[0].get('OBJECTID')).to.be('287');
@@ -224,7 +224,7 @@ describe('ol.format.WMSGetFeatureInfo', function() {
             '    </opengeo:roads>' +
             '  </gml:featureMember>' +
             '</wfs:FeatureCollection>';
-        var features = new _ol_format_WMSGetFeatureInfo_().readFeatures(text);
+        var features = new WMSGetFeatureInfo().readFeatures(text);
         expect(features.length).to.be(1);
         expect(features[0].get('cat')).to.be('3');
         expect(features[0].getGeometry().getType()).to.be('MultiLineString');