diff --git a/src/objectliterals.jsdoc b/src/objectliterals.jsdoc
index 3083d5e950..26430e0b36 100644
--- a/src/objectliterals.jsdoc
+++ b/src/objectliterals.jsdoc
@@ -952,7 +952,7 @@
  */
 
 /**
- * @typedef {Object} olx.source.VectorFileOptions
+ * @typedef {Object} olx.source.StaticVectorOptions
  * @property {ArrayBuffer|undefined} arrayBuffer Array buffer.
  * @property {Array.<ol.Attribution>|undefined} attributions Attributions.
  * @property {Document|undefined} doc Document.
diff --git a/src/ol/source/geojsonsource.js b/src/ol/source/geojsonsource.js
index 1ee7532fd3..230a79b105 100644
--- a/src/ol/source/geojsonsource.js
+++ b/src/ol/source/geojsonsource.js
@@ -1,13 +1,13 @@
 goog.provide('ol.source.GeoJSON');
 
 goog.require('ol.format.GeoJSON');
-goog.require('ol.source.VectorFile');
+goog.require('ol.source.StaticVector');
 
 
 
 /**
  * @constructor
- * @extends {ol.source.VectorFile}
+ * @extends {ol.source.StaticVector}
  * @fires {@link ol.source.VectorEvent} ol.source.VectorEvent
  * @param {olx.source.GeoJSONOptions=} opt_options Options.
  * @todo stability experimental
@@ -31,4 +31,4 @@ ol.source.GeoJSON = function(opt_options) {
   });
 
 };
-goog.inherits(ol.source.GeoJSON, ol.source.VectorFile);
+goog.inherits(ol.source.GeoJSON, ol.source.StaticVector);
diff --git a/src/ol/source/gpxsource.js b/src/ol/source/gpxsource.js
index 1db7f23603..447751e7dd 100644
--- a/src/ol/source/gpxsource.js
+++ b/src/ol/source/gpxsource.js
@@ -1,13 +1,13 @@
 goog.provide('ol.source.GPX');
 
 goog.require('ol.format.GPX');
-goog.require('ol.source.VectorFile');
+goog.require('ol.source.StaticVector');
 
 
 
 /**
  * @constructor
- * @extends {ol.source.VectorFile}
+ * @extends {ol.source.StaticVector}
  * @fires {@link ol.source.VectorEvent} ol.source.VectorEvent
  * @param {olx.source.GPXOptions=} opt_options Options.
  * @todo stability experimental
@@ -30,4 +30,4 @@ ol.source.GPX = function(opt_options) {
   });
 
 };
-goog.inherits(ol.source.GPX, ol.source.VectorFile);
+goog.inherits(ol.source.GPX, ol.source.StaticVector);
diff --git a/src/ol/source/igcsource.js b/src/ol/source/igcsource.js
index c8f19cddfd..320dda80da 100644
--- a/src/ol/source/igcsource.js
+++ b/src/ol/source/igcsource.js
@@ -1,13 +1,13 @@
 goog.provide('ol.source.IGC');
 
 goog.require('ol.format.IGC');
-goog.require('ol.source.VectorFile');
+goog.require('ol.source.StaticVector');
 
 
 
 /**
  * @constructor
- * @extends {ol.source.VectorFile}
+ * @extends {ol.source.StaticVector}
  * @fires {@link ol.source.VectorEvent} ol.source.VectorEvent
  * @param {olx.source.IGCOptions=} opt_options Options.
  * @todo stability experimental
@@ -27,4 +27,4 @@ ol.source.IGC = function(opt_options) {
   });
 
 };
-goog.inherits(ol.source.IGC, ol.source.VectorFile);
+goog.inherits(ol.source.IGC, ol.source.StaticVector);
diff --git a/src/ol/source/kmlsource.js b/src/ol/source/kmlsource.js
index 00b3891a54..c94b70bf69 100644
--- a/src/ol/source/kmlsource.js
+++ b/src/ol/source/kmlsource.js
@@ -1,13 +1,13 @@
 goog.provide('ol.source.KML');
 
 goog.require('ol.format.KML');
-goog.require('ol.source.VectorFile');
+goog.require('ol.source.StaticVector');
 
 
 
 /**
  * @constructor
- * @extends {ol.source.VectorFile}
+ * @extends {ol.source.StaticVector}
  * @fires {@link ol.source.VectorEvent} ol.source.VectorEvent
  * @param {olx.source.KMLOptions=} opt_options Options.
  * @todo stability experimental
@@ -32,4 +32,4 @@ ol.source.KML = function(opt_options) {
   });
 
 };
-goog.inherits(ol.source.KML, ol.source.VectorFile);
+goog.inherits(ol.source.KML, ol.source.StaticVector);
diff --git a/src/ol/source/osmxmlsource.js b/src/ol/source/osmxmlsource.js
index b93ca145b2..2baecbaa20 100644
--- a/src/ol/source/osmxmlsource.js
+++ b/src/ol/source/osmxmlsource.js
@@ -1,13 +1,13 @@
 goog.provide('ol.source.OSMXML');
 
 goog.require('ol.format.OSMXML');
-goog.require('ol.source.VectorFile');
+goog.require('ol.source.StaticVector');
 
 
 
 /**
  * @constructor
- * @extends {ol.source.VectorFile}
+ * @extends {ol.source.StaticVector}
  * @fires {@link ol.source.VectorEvent} ol.source.VectorEvent
  * @param {olx.source.OSMXMLOptions=} opt_options Options.
  */
@@ -29,4 +29,4 @@ ol.source.OSMXML = function(opt_options) {
   });
 
 };
-goog.inherits(ol.source.OSMXML, ol.source.VectorFile);
+goog.inherits(ol.source.OSMXML, ol.source.StaticVector);
diff --git a/src/ol/source/staticvectorsource.exports b/src/ol/source/staticvectorsource.exports
new file mode 100644
index 0000000000..1c283475e6
--- /dev/null
+++ b/src/ol/source/staticvectorsource.exports
@@ -0,0 +1 @@
+@exportSymbol ol.source.StaticVector
diff --git a/src/ol/source/vectorfilesource.js b/src/ol/source/staticvectorsource.js
similarity index 92%
rename from src/ol/source/vectorfilesource.js
rename to src/ol/source/staticvectorsource.js
index 885a69335a..ace4886d3b 100644
--- a/src/ol/source/vectorfilesource.js
+++ b/src/ol/source/staticvectorsource.js
@@ -1,7 +1,7 @@
 // FIXME consider delaying feature reading so projection can be provided by
 // consumer (e.g. the view)
 
-goog.provide('ol.source.VectorFile');
+goog.provide('ol.source.StaticVector');
 
 goog.require('goog.asserts');
 goog.require('goog.dispose');
@@ -23,10 +23,10 @@ goog.require('ol.xml');
  * @constructor
  * @extends {ol.source.Vector}
  * @fires {@link ol.source.VectorEvent} ol.source.VectorEvent
- * @param {olx.source.VectorFileOptions=} opt_options Options.
+ * @param {olx.source.StaticVectorOptions=} opt_options Options.
  * @todo stability experimental
  */
-ol.source.VectorFile = function(opt_options) {
+ol.source.StaticVector = function(opt_options) {
 
   var options = goog.isDef(opt_options) ? opt_options : {};
 
@@ -96,14 +96,14 @@ ol.source.VectorFile = function(opt_options) {
   }
 
 };
-goog.inherits(ol.source.VectorFile, ol.source.Vector);
+goog.inherits(ol.source.StaticVector, ol.source.Vector);
 
 
 /**
  * @param {Event} event Event.
  * @private
  */
-ol.source.VectorFile.prototype.handleXhrIo_ = function(event) {
+ol.source.StaticVector.prototype.handleXhrIo_ = function(event) {
   var xhrIo = event.target;
   goog.asserts.assertInstanceof(xhrIo, goog.net.XhrIo);
   if (xhrIo.isSuccess()) {
@@ -145,7 +145,7 @@ ol.source.VectorFile.prototype.handleXhrIo_ = function(event) {
  * @param {ArrayBuffer|Document|Node|Object|string} source Source.
  * @private
  */
-ol.source.VectorFile.prototype.readFeatures_ = function(source) {
+ol.source.StaticVector.prototype.readFeatures_ = function(source) {
   var format = this.format;
   var features = format.readFeatures(source);
   var featureProjection = format.readProjection(source);
diff --git a/src/ol/source/topojsonsource.js b/src/ol/source/topojsonsource.js
index 991c72afb8..cd65cf76ba 100644
--- a/src/ol/source/topojsonsource.js
+++ b/src/ol/source/topojsonsource.js
@@ -1,13 +1,13 @@
 goog.provide('ol.source.TopoJSON');
 
 goog.require('ol.format.TopoJSON');
-goog.require('ol.source.VectorFile');
+goog.require('ol.source.StaticVector');
 
 
 
 /**
  * @constructor
- * @extends {ol.source.VectorFile}
+ * @extends {ol.source.StaticVector}
  * @fires {@link ol.source.VectorEvent} ol.source.VectorEvent
  * @param {olx.source.TopoJSONOptions=} opt_options Options.
  * @todo stability experimental
@@ -30,4 +30,4 @@ ol.source.TopoJSON = function(opt_options) {
   });
 
 };
-goog.inherits(ol.source.TopoJSON, ol.source.VectorFile);
+goog.inherits(ol.source.TopoJSON, ol.source.StaticVector);
diff --git a/src/ol/source/vectorfilesource.exports b/src/ol/source/vectorfilesource.exports
deleted file mode 100644
index acd6140571..0000000000
--- a/src/ol/source/vectorfilesource.exports
+++ /dev/null
@@ -1 +0,0 @@
-@exportSymbol ol.source.VectorFile