diff --git a/examples/vector-osm.html b/examples/vector-osm.html
index bbf94f97ba..67400eee6f 100644
--- a/examples/vector-osm.html
+++ b/examples/vector-osm.html
@@ -32,11 +32,11 @@
 
         <div class="span4">
           <h4 id="title">OSM XML example</h4>
-          <p id="shortdesc">Example of using the OSM XML source.  Vector data is loaded dynamically from a remote server using a tiling strategy.</p>
+          <p id="shortdesc">Example of using the OSM XML source.  Vector data is loaded dynamically from a server using a tiling strategy.</p>
           <div id="docs">
             <p>See the <a href="vector-osm.js" target="_blank">vector-osm.js source</a> to see how this is done.</p>
           </div>
-          <div id="tags">vector, osm, xml, loading, remote</div>
+          <div id="tags">vector, osm, xml, loading, server</div>
         </div>
         <div class="span4 offset4">
           <div id="info" class="alert alert-success">
diff --git a/examples/vector-osm.js b/examples/vector-osm.js
index 5c154e2d13..94427a1b14 100644
--- a/examples/vector-osm.js
+++ b/examples/vector-osm.js
@@ -6,7 +6,7 @@ goog.require('ol.layer.Vector');
 goog.require('ol.loading');
 goog.require('ol.proj');
 goog.require('ol.source.BingMaps');
-goog.require('ol.source.RemoteVector');
+goog.require('ol.source.ServerVector');
 goog.require('ol.style.Circle');
 goog.require('ol.style.Fill');
 goog.require('ol.style.Stroke');
@@ -88,7 +88,7 @@ var styles = {
 };
 
 var epsg3857ToEPSG4326 = ol.proj.getTransform('EPSG:3857', 'EPSG:4326');
-var vectorSource = new ol.source.RemoteVector({
+var vectorSource = new ol.source.ServerVector({
   extentUrlFunction: function(extent, resolution) {
     var epsg4326Extent = epsg3857ToEPSG4326(extent, []);
     return 'http://overpass-api.de/api/xapi?map?bbox=' +
diff --git a/src/objectliterals.jsdoc b/src/objectliterals.jsdoc
index fe87dcf667..7d03ce5bb8 100644
--- a/src/objectliterals.jsdoc
+++ b/src/objectliterals.jsdoc
@@ -905,7 +905,7 @@
  */
 
 /**
- * @typedef {Object} olx.source.RemoteVectorOptions
+ * @typedef {Object} olx.source.ServerVectorOptions
  * @property {Array.<ol.Attribution>|undefined} attributions Attributions.
  * @property {ol.Extent|undefined} extent Extent.
  * @property {function(ol.Extent, number, ol.proj.Projection): string} extentUrlFunction Extent URL function.
diff --git a/src/ol/source/remotevectorsource.exports b/src/ol/source/remotevectorsource.exports
deleted file mode 100644
index 3e984107fd..0000000000
--- a/src/ol/source/remotevectorsource.exports
+++ /dev/null
@@ -1 +0,0 @@
-@exportSymbol ol.source.RemoteVector
diff --git a/src/ol/source/servervectorsource.exports b/src/ol/source/servervectorsource.exports
new file mode 100644
index 0000000000..03a26a0698
--- /dev/null
+++ b/src/ol/source/servervectorsource.exports
@@ -0,0 +1 @@
+@exportSymbol ol.source.ServerVector
diff --git a/src/ol/source/remotevectorsource.js b/src/ol/source/servervectorsource.js
similarity index 87%
rename from src/ol/source/remotevectorsource.js
rename to src/ol/source/servervectorsource.js
index 3b37c560fb..7f30394494 100644
--- a/src/ol/source/remotevectorsource.js
+++ b/src/ol/source/servervectorsource.js
@@ -1,6 +1,6 @@
 // FIXME cache expiration
 
-goog.provide('ol.source.RemoteVector');
+goog.provide('ol.source.ServerVector');
 
 goog.require('ol.extent');
 goog.require('ol.source.FormatVector');
@@ -11,9 +11,9 @@ goog.require('ol.structs.RBush');
 /**
  * @constructor
  * @extends {ol.source.FormatVector}
- * @param {olx.source.RemoteVectorOptions} options Options.
+ * @param {olx.source.ServerVectorOptions} options Options.
  */
-ol.source.RemoteVector = function(options) {
+ol.source.ServerVector = function(options) {
 
   goog.base(this, {
     attributions: options.attributions,
@@ -49,13 +49,13 @@ ol.source.RemoteVector = function(options) {
   this.loadedFeatures_ = {};
 
 };
-goog.inherits(ol.source.RemoteVector, ol.source.FormatVector);
+goog.inherits(ol.source.ServerVector, ol.source.FormatVector);
 
 
 /**
  * @inheritDoc
  */
-ol.source.RemoteVector.prototype.addFeaturesInternal = function(features) {
+ol.source.ServerVector.prototype.addFeaturesInternal = function(features) {
   /** @type {Array.<ol.Feature>} */
   var notLoadedFeatures = [];
   var i, ii;
@@ -74,7 +74,7 @@ ol.source.RemoteVector.prototype.addFeaturesInternal = function(features) {
 /**
  * @inheritDoc
  */
-ol.source.RemoteVector.prototype.loadFeatures =
+ol.source.ServerVector.prototype.loadFeatures =
     function(extent, resolution, projection) {
   var loadedExtents = this.loadedExtents_;
   var extentsToLoad = this.loadingFunction_(extent, resolution);