diff --git a/examples/ten-thousand-points.js b/examples/ten-thousand-points.js
index c98b542d7b..8eeea59b95 100644
--- a/examples/ten-thousand-points.js
+++ b/examples/ten-thousand-points.js
@@ -8,7 +8,7 @@ goog.require('ol.geom2.PointCollection');
 goog.require('ol.layer.Tile');
 goog.require('ol.layer.VectorLayer2');
 goog.require('ol.source.OSM');
-goog.require('ol.source.VectorSource2');
+goog.require('ol.source.Vector2');
 goog.require('ol.webgl.SUPPORTED');
 
 
@@ -60,7 +60,7 @@ if (!ol.webgl.SUPPORTED) {
         source: new ol.source.OSM()
       }),
       new ol.layer.VectorLayer2({
-        source: new ol.source.VectorSource2({
+        source: new ol.source.Vector2({
           lineStringCollections: [lineStringCollection],
           projection: 'EPSG:3857',
           pointCollections: [pointCollection]
diff --git a/src/objectliterals.jsdoc b/src/objectliterals.jsdoc
index fcb8669daf..afcbbf84d4 100644
--- a/src/objectliterals.jsdoc
+++ b/src/objectliterals.jsdoc
@@ -564,7 +564,7 @@
  */
 
 /**
- * @typedef {Object} ol.source.VectorSource2Options
+ * @typedef {Object} ol.source.Vector2Options
  * @property {Array.<ol.Attribution>|undefined} attributions Attributions.
  * @property {ol.Extent|undefined} extent Extent.
  * @property {Array.<ol.geom2.LineStringCollection>|undefined}
diff --git a/src/ol/layer/vectorlayer2.js b/src/ol/layer/vectorlayer2.js
index 471fdb8b75..2f17d8783e 100644
--- a/src/ol/layer/vectorlayer2.js
+++ b/src/ol/layer/vectorlayer2.js
@@ -1,7 +1,7 @@
 goog.provide('ol.layer.VectorLayer2');
 
 goog.require('ol.layer.Layer');
-goog.require('ol.source.VectorSource2');
+goog.require('ol.source.Vector2');
 
 
 
@@ -18,8 +18,8 @@ goog.inherits(ol.layer.VectorLayer2, ol.layer.Layer);
 
 
 /**
- * @return {ol.source.VectorSource2} Source.
+ * @return {ol.source.Vector2} Source.
  */
 ol.layer.VectorLayer2.prototype.getVectorSource = function() {
-  return /** @type {ol.source.VectorSource2} */ (this.getSource());
+  return /** @type {ol.source.Vector2} */ (this.getSource());
 };
diff --git a/src/ol/source/vectorsource2.exports b/src/ol/source/vectorsource2.exports
index 1d3cf6c8ed..ce5f6b3c85 100644
--- a/src/ol/source/vectorsource2.exports
+++ b/src/ol/source/vectorsource2.exports
@@ -1 +1 @@
-@exportSymbol ol.source.VectorSource2
+@exportSymbol ol.source.Vector2
diff --git a/src/ol/source/vectorsource2.js b/src/ol/source/vectorsource2.js
index e5e72f37bd..a4ea79dc01 100644
--- a/src/ol/source/vectorsource2.js
+++ b/src/ol/source/vectorsource2.js
@@ -1,4 +1,4 @@
-goog.provide('ol.source.VectorSource2');
+goog.provide('ol.source.Vector2');
 
 goog.require('ol.geom2.LineStringCollection');
 goog.require('ol.geom2.PointCollection');
@@ -10,9 +10,9 @@ goog.require('ol.source.Source');
  * This is an internal class that will be removed from the API.
  * @constructor
  * @extends {ol.source.Source}
- * @param {ol.source.VectorSource2Options} options Options.
+ * @param {ol.source.Vector2Options} options Options.
  */
-ol.source.VectorSource2 = function(options) {
+ol.source.Vector2 = function(options) {
 
   goog.base(this, {
     attributions: options.attributions,
@@ -35,13 +35,13 @@ ol.source.VectorSource2 = function(options) {
       options.lineStringCollections : [];
 
 };
-goog.inherits(ol.source.VectorSource2, ol.source.Source);
+goog.inherits(ol.source.Vector2, ol.source.Source);
 
 
 /**
  * @return {Array.<ol.geom2.LineStringCollection>} Line string collections.
  */
-ol.source.VectorSource2.prototype.getLineStringCollections = function() {
+ol.source.Vector2.prototype.getLineStringCollections = function() {
   return this.lineStringCollections_;
 };
 
@@ -49,6 +49,6 @@ ol.source.VectorSource2.prototype.getLineStringCollections = function() {
 /**
  * @return {Array.<ol.geom2.PointCollection>} Point collections.
  */
-ol.source.VectorSource2.prototype.getPointCollections = function() {
+ol.source.Vector2.prototype.getPointCollections = function() {
   return this.pointCollections_;
 };