diff --git a/src/ol/parser/geojson.exports b/src/ol/parser/geojson.exports
deleted file mode 100644
index 7143cfbf11..0000000000
--- a/src/ol/parser/geojson.exports
+++ /dev/null
@@ -1,6 +0,0 @@
-@exportSymbol ol.parser.GeoJSON
-
-@exportProperty ol.parser.GeoJSON.prototype.read
-@exportProperty ol.parser.GeoJSON.read
-@exportProperty ol.parser.GeoJSON.prototype.write
-@exportProperty ol.parser.GeoJSON.write
diff --git a/src/ol/parser/geojsonparser.exports b/src/ol/parser/geojsonparser.exports
new file mode 100644
index 0000000000..0573b46441
--- /dev/null
+++ b/src/ol/parser/geojsonparser.exports
@@ -0,0 +1 @@
+@exportSymbol ol.parser.GeoJSON
diff --git a/src/ol/parser/geojson.js b/src/ol/parser/geojsonparser.js
similarity index 100%
rename from src/ol/parser/geojson.js
rename to src/ol/parser/geojsonparser.js
diff --git a/src/ol/parser/gpx.exports b/src/ol/parser/gpx.exports
deleted file mode 100644
index 57d874bb80..0000000000
--- a/src/ol/parser/gpx.exports
+++ /dev/null
@@ -1,3 +0,0 @@
-@exportSymbol ol.parser.GPX
-@exportProperty ol.parser.GPX.prototype.read
-@exportProperty ol.parser.GPX.prototype.write
diff --git a/src/ol/parser/gpxparser.exports b/src/ol/parser/gpxparser.exports
new file mode 100644
index 0000000000..3cb2cef914
--- /dev/null
+++ b/src/ol/parser/gpxparser.exports
@@ -0,0 +1 @@
+@exportSymbol ol.parser.GPX
diff --git a/src/ol/parser/gpx.js b/src/ol/parser/gpxparser.js
similarity index 100%
rename from src/ol/parser/gpx.js
rename to src/ol/parser/gpxparser.js
diff --git a/src/ol/parser/kml.exports b/src/ol/parser/kml.exports
deleted file mode 100644
index d389b1ad42..0000000000
--- a/src/ol/parser/kml.exports
+++ /dev/null
@@ -1,3 +0,0 @@
-@exportSymbol ol.parser.KML
-@exportProperty ol.parser.KML.prototype.read
-@exportProperty ol.parser.KML.prototype.write
diff --git a/src/ol/parser/kmlparser.exports b/src/ol/parser/kmlparser.exports
new file mode 100644
index 0000000000..d625f017ba
--- /dev/null
+++ b/src/ol/parser/kmlparser.exports
@@ -0,0 +1 @@
+@exportSymbol ol.parser.KML
diff --git a/src/ol/parser/kml.js b/src/ol/parser/kmlparser.js
similarity index 100%
rename from src/ol/parser/kml.js
rename to src/ol/parser/kmlparser.js
diff --git a/src/ol/parser/ogc/exceptionreport.js b/src/ol/parser/ogc/exceptionreportparser.js
similarity index 100%
rename from src/ol/parser/ogc/exceptionreport.js
rename to src/ol/parser/ogc/exceptionreportparser.js
diff --git a/src/ol/parser/ogc/filter.js b/src/ol/parser/ogc/filterparser.js
similarity index 100%
rename from src/ol/parser/ogc/filter.js
rename to src/ol/parser/ogc/filterparser.js
diff --git a/src/ol/parser/ogc/filter_v1.js b/src/ol/parser/ogc/filterparser_v1.js
similarity index 100%
rename from src/ol/parser/ogc/filter_v1.js
rename to src/ol/parser/ogc/filterparser_v1.js
diff --git a/src/ol/parser/ogc/filter_v1_0_0.js b/src/ol/parser/ogc/filterparser_v1_0_0.js
similarity index 100%
rename from src/ol/parser/ogc/filter_v1_0_0.js
rename to src/ol/parser/ogc/filterparser_v1_0_0.js
diff --git a/src/ol/parser/ogc/filter_v1_1_0.js b/src/ol/parser/ogc/filterparser_v1_1_0.js
similarity index 100%
rename from src/ol/parser/ogc/filter_v1_1_0.js
rename to src/ol/parser/ogc/filterparser_v1_1_0.js
diff --git a/src/ol/parser/ogc/gml.exports b/src/ol/parser/ogc/gmlparser.exports
similarity index 100%
rename from src/ol/parser/ogc/gml.exports
rename to src/ol/parser/ogc/gmlparser.exports
diff --git a/src/ol/parser/ogc/gml.js b/src/ol/parser/ogc/gmlparser.js
similarity index 100%
rename from src/ol/parser/ogc/gml.js
rename to src/ol/parser/ogc/gmlparser.js
diff --git a/src/ol/parser/ogc/gml_v2.js b/src/ol/parser/ogc/gmlparser_v2.js
similarity index 100%
rename from src/ol/parser/ogc/gml_v2.js
rename to src/ol/parser/ogc/gmlparser_v2.js
diff --git a/src/ol/parser/ogc/gml_v3.js b/src/ol/parser/ogc/gmlparser_v3.js
similarity index 100%
rename from src/ol/parser/ogc/gml_v3.js
rename to src/ol/parser/ogc/gmlparser_v3.js
diff --git a/src/ol/parser/ogc/owscommon_v1.js b/src/ol/parser/ogc/owscommonparser_v1.js
similarity index 100%
rename from src/ol/parser/ogc/owscommon_v1.js
rename to src/ol/parser/ogc/owscommonparser_v1.js
diff --git a/src/ol/parser/ogc/owscommon_v1_1_0.js b/src/ol/parser/ogc/owscommonparser_v1_1_0.js
similarity index 100%
rename from src/ol/parser/ogc/owscommon_v1_1_0.js
rename to src/ol/parser/ogc/owscommonparser_v1_1_0.js
diff --git a/src/ol/parser/ogc/versioned.js b/src/ol/parser/ogc/versionedparser.js
similarity index 100%
rename from src/ol/parser/ogc/versioned.js
rename to src/ol/parser/ogc/versionedparser.js
diff --git a/src/ol/parser/ogc/wmscapabilities.exports b/src/ol/parser/ogc/wmscapabilitiesparser.exports
similarity index 100%
rename from src/ol/parser/ogc/wmscapabilities.exports
rename to src/ol/parser/ogc/wmscapabilitiesparser.exports
diff --git a/src/ol/parser/ogc/wmscapabilities.js b/src/ol/parser/ogc/wmscapabilitiesparser.js
similarity index 100%
rename from src/ol/parser/ogc/wmscapabilities.js
rename to src/ol/parser/ogc/wmscapabilitiesparser.js
diff --git a/src/ol/parser/ogc/wmscapabilities_v1.js b/src/ol/parser/ogc/wmscapabilitiesparser_v1.js
similarity index 100%
rename from src/ol/parser/ogc/wmscapabilities_v1.js
rename to src/ol/parser/ogc/wmscapabilitiesparser_v1.js
diff --git a/src/ol/parser/ogc/wmscapabilities_v1_0_0.js b/src/ol/parser/ogc/wmscapabilitiesparser_v1_0_0.js
similarity index 100%
rename from src/ol/parser/ogc/wmscapabilities_v1_0_0.js
rename to src/ol/parser/ogc/wmscapabilitiesparser_v1_0_0.js
diff --git a/src/ol/parser/ogc/wmscapabilities_v1_1.js b/src/ol/parser/ogc/wmscapabilitiesparser_v1_1.js
similarity index 100%
rename from src/ol/parser/ogc/wmscapabilities_v1_1.js
rename to src/ol/parser/ogc/wmscapabilitiesparser_v1_1.js
diff --git a/src/ol/parser/ogc/wmscapabilities_v1_1_0.js b/src/ol/parser/ogc/wmscapabilitiesparser_v1_1_0.js
similarity index 100%
rename from src/ol/parser/ogc/wmscapabilities_v1_1_0.js
rename to src/ol/parser/ogc/wmscapabilitiesparser_v1_1_0.js
diff --git a/src/ol/parser/ogc/wmscapabilities_v1_1_1.js b/src/ol/parser/ogc/wmscapabilitiesparser_v1_1_1.js
similarity index 100%
rename from src/ol/parser/ogc/wmscapabilities_v1_1_1.js
rename to src/ol/parser/ogc/wmscapabilitiesparser_v1_1_1.js
diff --git a/src/ol/parser/ogc/wmscapabilities_v1_1_1_WMSC.js b/src/ol/parser/ogc/wmscapabilitiesparser_v1_1_1_WMSC.js
similarity index 100%
rename from src/ol/parser/ogc/wmscapabilities_v1_1_1_WMSC.js
rename to src/ol/parser/ogc/wmscapabilitiesparser_v1_1_1_WMSC.js
diff --git a/src/ol/parser/ogc/wmscapabilities_v1_3_0.js b/src/ol/parser/ogc/wmscapabilitiesparser_v1_3_0.js
similarity index 100%
rename from src/ol/parser/ogc/wmscapabilities_v1_3_0.js
rename to src/ol/parser/ogc/wmscapabilitiesparser_v1_3_0.js
diff --git a/src/ol/parser/ogc/wmtscapabilities.exports b/src/ol/parser/ogc/wmtscapabilitiesparser.exports
similarity index 100%
rename from src/ol/parser/ogc/wmtscapabilities.exports
rename to src/ol/parser/ogc/wmtscapabilitiesparser.exports
diff --git a/src/ol/parser/ogc/wmtscapabilities.js b/src/ol/parser/ogc/wmtscapabilitiesparser.js
similarity index 100%
rename from src/ol/parser/ogc/wmtscapabilities.js
rename to src/ol/parser/ogc/wmtscapabilitiesparser.js
diff --git a/src/ol/parser/ogc/wmtscapabilities_v1_0_0.js b/src/ol/parser/ogc/wmtscapabilitiesparser_v1_0_0.js
similarity index 100%
rename from src/ol/parser/ogc/wmtscapabilities_v1_0_0.js
rename to src/ol/parser/ogc/wmtscapabilitiesparser_v1_0_0.js
diff --git a/src/ol/parser/polyline.js b/src/ol/parser/polylineparser.js
similarity index 100%
rename from src/ol/parser/polyline.js
rename to src/ol/parser/polylineparser.js
diff --git a/src/ol/parser/topojson.exports b/src/ol/parser/topojson.exports
deleted file mode 100644
index 68b86dff97..0000000000
--- a/src/ol/parser/topojson.exports
+++ /dev/null
@@ -1,4 +0,0 @@
-@exportSymbol ol.parser.TopoJSON
-
-@exportProperty ol.parser.TopoJSON.prototype.read
-@exportProperty ol.parser.TopoJSON.read
diff --git a/src/ol/parser/topojsonparser.exports b/src/ol/parser/topojsonparser.exports
new file mode 100644
index 0000000000..eb09e6f28c
--- /dev/null
+++ b/src/ol/parser/topojsonparser.exports
@@ -0,0 +1 @@
+@exportSymbol ol.parser.TopoJSON
diff --git a/src/ol/parser/topojson.js b/src/ol/parser/topojsonparser.js
similarity index 100%
rename from src/ol/parser/topojson.js
rename to src/ol/parser/topojsonparser.js
diff --git a/src/ol/parser/wkt.exports b/src/ol/parser/wktparser.exports
similarity index 100%
rename from src/ol/parser/wkt.exports
rename to src/ol/parser/wktparser.exports
diff --git a/src/ol/parser/wkt.js b/src/ol/parser/wktparser.js
similarity index 100%
rename from src/ol/parser/wkt.js
rename to src/ol/parser/wktparser.js
diff --git a/src/ol/parser/xml.js b/src/ol/parser/xmlparser.js
similarity index 100%
rename from src/ol/parser/xml.js
rename to src/ol/parser/xmlparser.js