diff --git a/examples/gpx.js b/examples/gpx.js
index 9416eded87..d709cdfcc0 100644
--- a/examples/gpx.js
+++ b/examples/gpx.js
@@ -16,7 +16,7 @@ var vector = new ol.layer.Vector({
   source: new ol.source.Vector({
     projection: ol.proj.get('EPSG:4326')
   }),
-  featureInfoFunction: function(features) {
+  transformFeatureInfo: function(features) {
     var info = [];
     for (var i = 0, ii = features.length; i < ii; ++i) {
       info.push(features[i].get('name') + ': ' + features[i].get('type'));
diff --git a/examples/kml.js b/examples/kml.js
index 154fba8f52..885ab94ff0 100644
--- a/examples/kml.js
+++ b/examples/kml.js
@@ -26,7 +26,7 @@ var vector = new ol.layer.Vector({
   source: new ol.source.Vector({
     projection: epsg4326
   }),
-  featureInfoFunction: function(features) {
+  transformFeatureInfo: function(features) {
     var info = [];
     for (var i = 0, ii = features.length; i < ii; ++i) {
       info.push(features[i].get('name'));
diff --git a/examples/vector-layer.js b/examples/vector-layer.js
index 6b5602e98e..8c09da46ae 100644
--- a/examples/vector-layer.js
+++ b/examples/vector-layer.js
@@ -29,7 +29,7 @@ var vector = new ol.layer.Vector({
       ]
     })
   ]}),
-  featureInfoFunction: function(features) {
+  transformFeatureInfo: function(features) {
     return features.length > 0 ?
         features[0].getFeatureId() + ': ' + features[0].get('name') : '&nbsp;';
   }
diff --git a/src/objectliterals.jsdoc b/src/objectliterals.jsdoc
index 353613f91c..6631096902 100644
--- a/src/objectliterals.jsdoc
+++ b/src/objectliterals.jsdoc
@@ -302,7 +302,7 @@
 /**
  * @typedef {Object} ol.layer.VectorLayerOptions
  * @property {function(Array.<ol.Feature>):string|
- *     undefined} featureInfoFunction Function to render an array of features
+ *     undefined} transformFeatureInfo Function to render an array of features
  *     into feature info markup. If not provided, a comma separated list the
  *     unique ids of the resulting features will be returned.
  * @property {number|undefined} opacity Opacity. 0-1. Default is 1.
diff --git a/src/ol/layer/vectorlayer.js b/src/ol/layer/vectorlayer.js
index 82af46a521..21b2f865b4 100644
--- a/src/ol/layer/vectorlayer.js
+++ b/src/ol/layer/vectorlayer.js
@@ -183,8 +183,8 @@ ol.layer.Vector = function(options) {
    * @type {function(Array.<ol.Feature>):string}
    * @private
    */
-  this.featureInfoFunction_ = goog.isDef(options.featureInfoFunction) ?
-      options.featureInfoFunction : ol.layer.Vector.uidFeatureInfoFunction;
+  this.transformFeatureInfo_ = goog.isDef(options.transformFeatureInfo) ?
+      options.transformFeatureInfo : ol.layer.Vector.uidTransformFeatureInfo;
 
   /**
    * TODO: this means we need to know dimension at construction
@@ -389,8 +389,8 @@ ol.layer.Vector.prototype.parseFeatures = function(data, parser, projection) {
 /**
  * @return {function(Array.<ol.Feature>):string} Feature info function.
  */
-ol.layer.Vector.prototype.getFeatureInfoFunction = function() {
-  return this.featureInfoFunction_;
+ol.layer.Vector.prototype.getTransformFeatureInfo = function() {
+  return this.transformFeatureInfo_;
 };
 
 
@@ -398,7 +398,7 @@ ol.layer.Vector.prototype.getFeatureInfoFunction = function() {
  * @param {Array.<ol.Feature>} features Features.
  * @return {string} Feature info.
  */
-ol.layer.Vector.uidFeatureInfoFunction = function(features) {
+ol.layer.Vector.uidTransformFeatureInfo = function(features) {
   var featureIds = goog.array.map(features,
       function(feature) { return goog.getUid(feature); });
   return featureIds.join(', ');
diff --git a/src/ol/renderer/canvas/canvasvectorlayerrenderer.js b/src/ol/renderer/canvas/canvasvectorlayerrenderer.js
index 7c56d15d19..d9d91ffb31 100644
--- a/src/ol/renderer/canvas/canvasvectorlayerrenderer.js
+++ b/src/ol/renderer/canvas/canvasvectorlayerrenderer.js
@@ -200,7 +200,7 @@ ol.renderer.canvas.VectorLayer.prototype.getTransform = function() {
 ol.renderer.canvas.VectorLayer.prototype.getFeatureInfoForPixel =
     function(pixel, success) {
   var callback = function(features, layer) {
-    success(layer.getFeatureInfoFunction()(features), layer);
+    success(layer.getTransformFeatureInfo()(features), layer);
   };
   this.getFeaturesForPixel(pixel, callback);
 };