diff --git a/examples/wms-single-image-custom-proj.html b/examples/wms-image-custom-proj.html
similarity index 90%
rename from examples/wms-single-image-custom-proj.html
rename to examples/wms-image-custom-proj.html
index e44ca9cf37..78c1b82e4f 100644
--- a/examples/wms-single-image-custom-proj.html
+++ b/examples/wms-image-custom-proj.html
@@ -41,7 +41,7 @@
           <p id="shortdesc">Example of two single image WMS layers.</p>
           <div id="docs">
             <p>Pixelmap 1:1'000'000 with National Parks overlay using the projection EPSG:21781.</p>
-            <p>See the <a href="wms-single-image-custom-proj.js" target="_blank">wms-single-image-custom-proj.js source</a> to see how this is done.</p>
+            <p>See the <a href="wms-image-custom-proj.js" target="_blank">wms-image-custom-proj.js source</a> to see how this is done.</p>
           </div>
           <div id="tags">wms, single image, projection</div>
         </div>
@@ -52,7 +52,7 @@
 
     <script src="http://cdnjs.cloudflare.com/ajax/libs/proj4js/1.1.0/proj4js-compressed.js" type="text/javascript"></script>
     <script src="http://cdnjs.cloudflare.com/ajax/libs/proj4js/1.1.0/defs/EPSG21781.js" type="text/javascript"></script>
-    <script src="loader.js?id=wms-single-image-custom-proj" type="text/javascript"></script>
+    <script src="loader.js?id=wms-image-custom-proj" type="text/javascript"></script>
     <script src="../resources/social-links.js" type="text/javascript"></script>
 
   </body>
diff --git a/examples/wms-single-image-custom-proj.js b/examples/wms-image-custom-proj.js
similarity index 92%
rename from examples/wms-single-image-custom-proj.js
rename to examples/wms-image-custom-proj.js
index 5313015614..8857bf3af3 100644
--- a/examples/wms-single-image-custom-proj.js
+++ b/examples/wms-image-custom-proj.js
@@ -4,7 +4,7 @@ goog.require('ol.RendererHints');
 goog.require('ol.View2D');
 goog.require('ol.layer.Image');
 goog.require('ol.proj');
-goog.require('ol.source.SingleImageWMS');
+goog.require('ol.source.ImageWMS');
 
 
 var projection = ol.proj.configureProj4jsProjection({
@@ -15,7 +15,7 @@ var projection = ol.proj.configureProj4jsProjection({
 var extent = [420000, 900000, 30000, 350000];
 var layers = [
   new ol.layer.Image({
-    source: new ol.source.SingleImageWMS({
+    source: new ol.source.ImageWMS({
       url: 'http://wms.geo.admin.ch/',
       crossOrigin: 'anonymous',
       attributions: [new ol.Attribution({
@@ -32,7 +32,7 @@ var layers = [
     })
   }),
   new ol.layer.Image({
-    source: new ol.source.SingleImageWMS({
+    source: new ol.source.ImageWMS({
       url: 'http://wms.geo.admin.ch/',
       crossOrigin: 'anonymous',
       attributions: [new ol.Attribution({
diff --git a/examples/wms-single-image.html b/examples/wms-image.html
similarity index 90%
rename from examples/wms-single-image.html
rename to examples/wms-image.html
index e0382abee3..25d5702159 100644
--- a/examples/wms-single-image.html
+++ b/examples/wms-image.html
@@ -40,7 +40,7 @@
           <h4 id="title">Single image WMS example</h4>
           <p id="shortdesc">Example of a single image WMS layer.</p>
           <div id="docs">
-            <p>See the <a href="wms-single-image.js" target="_blank">wms-single-image.js source</a> to see how this is done.</p>
+            <p>See the <a href="wms-image.js" target="_blank">wms-image.js source</a> to see how this is done.</p>
           </div>
           <div id="tags">wms, image</div>
         </div>
@@ -49,7 +49,7 @@
 
     </div>
 
-    <script src="loader.js?id=wms-single-image" type="text/javascript"></script>
+    <script src="loader.js?id=wms-image" type="text/javascript"></script>
     <script src="../resources/social-links.js" type="text/javascript"></script>
 
   </body>
diff --git a/examples/wms-single-image.js b/examples/wms-image.js
similarity index 88%
rename from examples/wms-single-image.js
rename to examples/wms-image.js
index 54b9fa696b..00fa91464d 100644
--- a/examples/wms-single-image.js
+++ b/examples/wms-image.js
@@ -3,8 +3,8 @@ goog.require('ol.RendererHint');
 goog.require('ol.View2D');
 goog.require('ol.layer.Image');
 goog.require('ol.layer.Tile');
+goog.require('ol.source.ImageWMS');
 goog.require('ol.source.MapQuestOpenAerial');
-goog.require('ol.source.SingleImageWMS');
 
 
 var layers = [
@@ -12,7 +12,7 @@ var layers = [
     source: new ol.source.MapQuestOpenAerial()
   }),
   new ol.layer.Image({
-    source: new ol.source.SingleImageWMS({
+    source: new ol.source.ImageWMS({
       url: 'http://demo.opengeo.org/geoserver/wms',
       params: {'LAYERS': 'topp:states'},
       extent: [-13884991, -7455066, 2870341, 6338219]
diff --git a/examples/wms-no-proj.js b/examples/wms-no-proj.js
index 6b836a8426..f85dcbf4d8 100644
--- a/examples/wms-no-proj.js
+++ b/examples/wms-no-proj.js
@@ -6,7 +6,7 @@ goog.require('ol.RendererHints');
 goog.require('ol.View2D');
 goog.require('ol.layer.Image');
 goog.require('ol.layer.Tile');
-goog.require('ol.source.SingleImageWMS');
+goog.require('ol.source.ImageWMS');
 goog.require('ol.source.TileWMS');
 
 
@@ -28,7 +28,7 @@ var layers = [
     })
   }),
   new ol.layer.Image({
-    source: new ol.source.SingleImageWMS({
+    source: new ol.source.ImageWMS({
       attributions: [new ol.Attribution({
         html: '&copy; ' +
             '<a href="http://www.geo.admin.ch/internet/geoportal/' +
diff --git a/src/objectliterals.jsdoc b/src/objectliterals.jsdoc
index 47e3fd108e..9ce3c92092 100644
--- a/src/objectliterals.jsdoc
+++ b/src/objectliterals.jsdoc
@@ -472,7 +472,7 @@
  */
 
 /**
- * @typedef {Object} ol.source.SingleImageWMSOptions
+ * @typedef {Object} ol.source.ImageWMSOptions
  * @property {Array.<ol.Attribution>|undefined} attributions Attributions.
  * @property {null|string|undefined} crossOrigin crossOrigin setting for image
  *     requests.
@@ -510,7 +510,7 @@
  */
 
 /**
- * @typedef {Object} ol.source.StaticImageOptions
+ * @typedef {Object} ol.source.ImageStaticOptions
  * @property {Array.<ol.Attribution>|undefined} attributions Attributions.
  * @property {null|string|undefined} crossOrigin crossOrigin setting for image
  *     requests.
diff --git a/src/ol/source/imagestaticsource.exports b/src/ol/source/imagestaticsource.exports
new file mode 100644
index 0000000000..4968e8f6f0
--- /dev/null
+++ b/src/ol/source/imagestaticsource.exports
@@ -0,0 +1 @@
+@exportClass ol.source.ImageStatic ol.source.ImageStaticOptions
diff --git a/src/ol/source/staticimagesource.js b/src/ol/source/imagestaticsource.js
similarity index 78%
rename from src/ol/source/staticimagesource.js
rename to src/ol/source/imagestaticsource.js
index d426549fa7..9e0723ea15 100644
--- a/src/ol/source/staticimagesource.js
+++ b/src/ol/source/imagestaticsource.js
@@ -1,4 +1,4 @@
-goog.provide('ol.source.StaticImage');
+goog.provide('ol.source.ImageStatic');
 
 goog.require('ol.Image');
 goog.require('ol.ImageUrlFunctionType');
@@ -11,11 +11,11 @@ goog.require('ol.source.Image');
 /**
  * @constructor
  * @extends {ol.source.Image}
- * @param {ol.source.StaticImageOptions} options Static image options.
+ * @param {ol.source.ImageStaticOptions} options Options.
  */
-ol.source.StaticImage = function(options) {
+ol.source.ImageStatic = function(options) {
 
-  var imageFunction = ol.source.StaticImage.createImageFunction(
+  var imageFunction = ol.source.ImageStatic.createImageFunction(
       options.url);
 
   var imageExtent = options.imageExtent;
@@ -40,13 +40,13 @@ ol.source.StaticImage = function(options) {
       imageExtent, imageResolution, imageSize, projection);
 
 };
-goog.inherits(ol.source.StaticImage, ol.source.Image);
+goog.inherits(ol.source.ImageStatic, ol.source.Image);
 
 
 /**
  * @inheritDoc
  */
-ol.source.StaticImage.prototype.getImage =
+ol.source.ImageStatic.prototype.getImage =
     function(extent, resolution, projection) {
   if (ol.extent.intersects(extent, this.image_.getExtent())) {
     return this.image_;
@@ -59,7 +59,7 @@ ol.source.StaticImage.prototype.getImage =
  * @param {string|undefined} url URL.
  * @return {ol.ImageUrlFunctionType} Function.
  */
-ol.source.StaticImage.createImageFunction = function(url) {
+ol.source.ImageStatic.createImageFunction = function(url) {
   return (
       /**
        * @param {ol.Extent} extent Extent.
diff --git a/src/ol/source/imagewmssource.exports b/src/ol/source/imagewmssource.exports
new file mode 100644
index 0000000000..0396ea145e
--- /dev/null
+++ b/src/ol/source/imagewmssource.exports
@@ -0,0 +1,3 @@
+@exportClass ol.source.ImageWMS ol.source.ImageWMSOptions
+@exportProperty ol.source.ImageWMS.prototype.getParams
+@exportProperty ol.source.ImageWMS.prototype.updateParams
diff --git a/src/ol/source/singleimagewmssource.js b/src/ol/source/imagewmssource.js
similarity index 84%
rename from src/ol/source/singleimagewmssource.js
rename to src/ol/source/imagewmssource.js
index 2d82b35da5..d69c5b7be9 100644
--- a/src/ol/source/singleimagewmssource.js
+++ b/src/ol/source/imagewmssource.js
@@ -1,4 +1,4 @@
-goog.provide('ol.source.SingleImageWMS');
+goog.provide('ol.source.ImageWMS');
 
 goog.require('goog.asserts');
 goog.require('goog.object');
@@ -15,9 +15,9 @@ goog.require('ol.source.wms');
  * @constructor
  * @extends {ol.source.Image}
  * @implements {ol.source.FeatureInfoSource}
- * @param {ol.source.SingleImageWMSOptions} options Options.
+ * @param {ol.source.ImageWMSOptions} options Options.
  */
-ol.source.SingleImageWMS = function(options) {
+ol.source.ImageWMS = function(options) {
 
   /**
    * @private
@@ -60,7 +60,7 @@ ol.source.SingleImageWMS = function(options) {
       options.ratio : 1.5;
 
 };
-goog.inherits(ol.source.SingleImageWMS, ol.source.Image);
+goog.inherits(ol.source.ImageWMS, ol.source.Image);
 
 
 /**
@@ -68,7 +68,7 @@ goog.inherits(ol.source.SingleImageWMS, ol.source.Image);
  * the "params" option, and possibly updated using the updateParams method.
  * @return {Object} Params.
  */
-ol.source.SingleImageWMS.prototype.getParams = function() {
+ol.source.ImageWMS.prototype.getParams = function() {
   return this.params_;
 };
 
@@ -76,7 +76,7 @@ ol.source.SingleImageWMS.prototype.getParams = function() {
 /**
  * @inheritDoc
  */
-ol.source.SingleImageWMS.prototype.getImage =
+ol.source.ImageWMS.prototype.getImage =
     function(extent, resolution, projection) {
   resolution = this.findNearestResolution(resolution);
 
@@ -101,7 +101,7 @@ ol.source.SingleImageWMS.prototype.getImage =
 /**
  * @inheritDoc
  */
-ol.source.SingleImageWMS.prototype.getFeatureInfoForPixel =
+ol.source.ImageWMS.prototype.getFeatureInfoForPixel =
     function(pixel, map, success, opt_error) {
   var view2D = map.getView().getView2D(),
       projection = view2D.getProjection(),
@@ -111,7 +111,7 @@ ol.source.SingleImageWMS.prototype.getFeatureInfoForPixel =
       extent = [bottomLeft[0], topRight[0], bottomLeft[1], topRight[1]],
       url = this.imageUrlFunction(extent, size, projection);
   goog.asserts.assert(goog.isDef(url),
-      'ol.source.SingleImageWMS#imageUrlFunction does not return a url');
+      'ol.source.ImageWMS#imageUrlFunction does not return a url');
   ol.source.wms.getFeatureInfo(url, pixel, this.getFeatureInfoOptions_, success,
       opt_error);
 };
@@ -121,7 +121,7 @@ ol.source.SingleImageWMS.prototype.getFeatureInfoForPixel =
  * Update the user-provided params.
  * @param {Object} params Params.
  */
-ol.source.SingleImageWMS.prototype.updateParams = function(params) {
+ol.source.ImageWMS.prototype.updateParams = function(params) {
   goog.object.extend(this.params_, params);
   this.image_ = null;
   this.dispatchChangeEvent();
diff --git a/src/ol/source/singleimagewmssource.exports b/src/ol/source/singleimagewmssource.exports
deleted file mode 100644
index 393cd6406a..0000000000
--- a/src/ol/source/singleimagewmssource.exports
+++ /dev/null
@@ -1,3 +0,0 @@
-@exportClass ol.source.SingleImageWMS ol.source.SingleImageWMSOptions
-@exportProperty ol.source.SingleImageWMS.prototype.getParams
-@exportProperty ol.source.SingleImageWMS.prototype.updateParams
diff --git a/src/ol/source/staticimagesource.exports b/src/ol/source/staticimagesource.exports
deleted file mode 100644
index 5df3d4893f..0000000000
--- a/src/ol/source/staticimagesource.exports
+++ /dev/null
@@ -1 +0,0 @@
-@exportClass ol.source.StaticImage ol.source.StaticImageOptions