diff --git a/examples/image-vector-layer.js b/examples/image-vector-layer.js
index 28bb6f2d32..37ec1b2622 100644
--- a/examples/image-vector-layer.js
+++ b/examples/image-vector-layer.js
@@ -3,7 +3,7 @@ goog.require('ol.RendererHint');
 goog.require('ol.View2D');
 goog.require('ol.layer.Image');
 goog.require('ol.layer.Tile');
-goog.require('ol.render.FeaturesOverlay');
+goog.require('ol.FeatureOverlay');
 goog.require('ol.source.GeoJSON');
 goog.require('ol.source.ImageVector');
 goog.require('ol.source.MapQuest');
@@ -56,7 +56,7 @@ var highlightStyleArray = [new ol.style.Style({
   })
 })];
 
-var featuresOverlay = new ol.render.FeaturesOverlay({
+var featuresOverlay = new ol.FeatureOverlay({
   map: map,
   styleFunction: function(feature, resolution) {
     return highlightStyleArray;
diff --git a/examples/select-features.js b/examples/select-features.js
index 388a411351..eb3f0681c9 100644
--- a/examples/select-features.js
+++ b/examples/select-features.js
@@ -5,7 +5,7 @@ goog.require('ol.interaction');
 goog.require('ol.interaction.Select');
 goog.require('ol.layer.Tile');
 goog.require('ol.layer.Vector');
-goog.require('ol.render.FeaturesOverlay');
+goog.require('ol.FeatureOverlay');
 goog.require('ol.source.GeoJSON');
 goog.require('ol.source.MapQuest');
 goog.require('ol.style.Fill');
@@ -41,7 +41,7 @@ var vector = new ol.layer.Vector({
 });
 
 var select = new ol.interaction.Select({
-  featuresOverlay: new ol.render.FeaturesOverlay({
+  featuresOverlay: new ol.FeatureOverlay({
     styleFunction: function(feature, layer) {
       return selectedStyle;
     }
diff --git a/examples/vector-layer.js b/examples/vector-layer.js
index a0f142a21a..5c5784fa6e 100644
--- a/examples/vector-layer.js
+++ b/examples/vector-layer.js
@@ -3,7 +3,7 @@ goog.require('ol.RendererHint');
 goog.require('ol.View2D');
 goog.require('ol.layer.Tile');
 goog.require('ol.layer.Vector');
-goog.require('ol.render.FeaturesOverlay');
+goog.require('ol.FeatureOverlay');
 goog.require('ol.source.GeoJSON');
 goog.require('ol.source.MapQuest');
 goog.require('ol.style.Fill');
@@ -62,7 +62,7 @@ var map = new ol.Map({
 
 var highlightStyleCache = {};
 
-var featuresOverlay = new ol.render.FeaturesOverlay({
+var featuresOverlay = new ol.FeatureOverlay({
   map: map,
   styleFunction: function(feature, resolution) {
     var text = resolution < 5000 ? feature.get('name') : '';
diff --git a/src/objectliterals.jsdoc b/src/objectliterals.jsdoc
index d64cd8437a..667c06795f 100644
--- a/src/objectliterals.jsdoc
+++ b/src/objectliterals.jsdoc
@@ -417,7 +417,7 @@
  *     features should be selected.
  * @property {Array.<ol.layer.Layer>|undefined} layers Layers.  Zero or more
  *     layers from which features should be selected.
- * @property {ol.render.FeaturesOverlay} featuresOverlay Features overlay.
+ * @property {ol.FeatureOverlay} featuresOverlay Features overlay.
  */
 
 /**
diff --git a/src/ol/featureoverlay.exports b/src/ol/featureoverlay.exports
index b613b77c0b..120ff391d2 100644
--- a/src/ol/featureoverlay.exports
+++ b/src/ol/featureoverlay.exports
@@ -1,7 +1,7 @@
-@exportSymbol ol.render.FeaturesOverlay
-@exportProperty ol.render.FeaturesOverlay.prototype.addFeature
-@exportProperty ol.render.FeaturesOverlay.prototype.getFeatures
-@exportProperty ol.render.FeaturesOverlay.prototype.setFeatures
-@exportProperty ol.render.FeaturesOverlay.prototype.setMap
-@exportProperty ol.render.FeaturesOverlay.prototype.setStyleFunction
-@exportProperty ol.render.FeaturesOverlay.prototype.removeFeature
+@exportSymbol ol.FeatureOverlay
+@exportProperty ol.FeatureOverlay.prototype.addFeature
+@exportProperty ol.FeatureOverlay.prototype.getFeatures
+@exportProperty ol.FeatureOverlay.prototype.setFeatures
+@exportProperty ol.FeatureOverlay.prototype.setMap
+@exportProperty ol.FeatureOverlay.prototype.setStyleFunction
+@exportProperty ol.FeatureOverlay.prototype.removeFeature
diff --git a/src/ol/featureoverlay.js b/src/ol/featureoverlay.js
index 659b6abbfd..2d94970b78 100644
--- a/src/ol/featureoverlay.js
+++ b/src/ol/featureoverlay.js
@@ -1,4 +1,4 @@
-goog.provide('ol.render.FeaturesOverlay');
+goog.provide('ol.FeatureOverlay');
 
 goog.require('goog.array');
 goog.require('goog.asserts');
@@ -18,7 +18,7 @@ goog.require('ol.render.EventType');
  * @param {olx.render.FeaturesOverlayOptions=} opt_options Options.
  * @todo stability experimental
  */
-ol.render.FeaturesOverlay = function(opt_options) {
+ol.FeatureOverlay = function(opt_options) {
 
   var options = goog.isDef(opt_options) ? opt_options : {};
 
@@ -84,7 +84,7 @@ ol.render.FeaturesOverlay = function(opt_options) {
  * @param {ol.Feature} feature Feature.
  * @todo stability experimental
  */
-ol.render.FeaturesOverlay.prototype.addFeature = function(feature) {
+ol.FeatureOverlay.prototype.addFeature = function(feature) {
   this.features_.push(feature);
 };
 
@@ -93,7 +93,7 @@ ol.render.FeaturesOverlay.prototype.addFeature = function(feature) {
  * @return {ol.Collection} Features collection.
  * @todo stability experimental
  */
-ol.render.FeaturesOverlay.prototype.getFeatures = function() {
+ol.FeatureOverlay.prototype.getFeatures = function() {
   return this.features_;
 };
 
@@ -101,7 +101,7 @@ ol.render.FeaturesOverlay.prototype.getFeatures = function() {
 /**
  * @private
  */
-ol.render.FeaturesOverlay.prototype.handleFeatureChange_ = function() {
+ol.FeatureOverlay.prototype.handleFeatureChange_ = function() {
   this.requestRenderFrame_();
 };
 
@@ -110,7 +110,7 @@ ol.render.FeaturesOverlay.prototype.handleFeatureChange_ = function() {
  * @private
  * @param {ol.CollectionEvent} collectionEvent Collection event.
  */
-ol.render.FeaturesOverlay.prototype.handleFeaturesAdd_ =
+ol.FeatureOverlay.prototype.handleFeaturesAdd_ =
     function(collectionEvent) {
   goog.asserts.assert(!goog.isNull(this.featureChangeListenerKeys_));
   var feature = /** @type {ol.Feature} */ (collectionEvent.element);
@@ -125,7 +125,7 @@ ol.render.FeaturesOverlay.prototype.handleFeaturesAdd_ =
  * @private
  * @param {ol.CollectionEvent} collectionEvent Collection event.
  */
-ol.render.FeaturesOverlay.prototype.handleFeaturesRemove_ =
+ol.FeatureOverlay.prototype.handleFeaturesRemove_ =
     function(collectionEvent) {
   goog.asserts.assert(!goog.isNull(this.featureChangeListenerKeys_));
   var feature = /** @type {ol.Feature} */ (collectionEvent.element);
@@ -140,7 +140,7 @@ ol.render.FeaturesOverlay.prototype.handleFeaturesRemove_ =
  * @param {ol.render.Event} event Event.
  * @private
  */
-ol.render.FeaturesOverlay.prototype.handleMapPostCompose_ = function(event) {
+ol.FeatureOverlay.prototype.handleMapPostCompose_ = function(event) {
   if (goog.isNull(this.features_) || !goog.isDef(this.styleFunction_)) {
     return;
   }
@@ -161,7 +161,7 @@ ol.render.FeaturesOverlay.prototype.handleMapPostCompose_ = function(event) {
  * @param {ol.Feature} feature Feature.
  * @todo stability experimental
  */
-ol.render.FeaturesOverlay.prototype.removeFeature = function(feature) {
+ol.FeatureOverlay.prototype.removeFeature = function(feature) {
   this.features_.remove(feature);
 };
 
@@ -169,7 +169,7 @@ ol.render.FeaturesOverlay.prototype.removeFeature = function(feature) {
 /**
  * @private
  */
-ol.render.FeaturesOverlay.prototype.requestRenderFrame_ = function() {
+ol.FeatureOverlay.prototype.requestRenderFrame_ = function() {
   if (!goog.isNull(this.map_)) {
     this.map_.requestRenderFrame();
   }
@@ -180,7 +180,7 @@ ol.render.FeaturesOverlay.prototype.requestRenderFrame_ = function() {
  * @param {ol.Collection} features Features collection.
  * @todo stability experimental
  */
-ol.render.FeaturesOverlay.prototype.setFeatures = function(features) {
+ol.FeatureOverlay.prototype.setFeatures = function(features) {
   if (!goog.isNull(this.featuresListenerKeys_)) {
     goog.array.forEach(this.featuresListenerKeys_, goog.events.unlistenByKey);
     this.featuresListenerKeys_ = null;
@@ -218,7 +218,7 @@ ol.render.FeaturesOverlay.prototype.setFeatures = function(features) {
  * @param {ol.Map} map Map.
  * @todo stability experimental
  */
-ol.render.FeaturesOverlay.prototype.setMap = function(map) {
+ol.FeatureOverlay.prototype.setMap = function(map) {
   if (!goog.isNull(this.postComposeListenerKey_)) {
     goog.events.unlistenByKey(this.postComposeListenerKey_);
     this.postComposeListenerKey_ = null;
@@ -238,7 +238,7 @@ ol.render.FeaturesOverlay.prototype.setMap = function(map) {
  * @param {ol.feature.StyleFunction} styleFunction Style function.
  * @todo stability experimental
  */
-ol.render.FeaturesOverlay.prototype.setStyleFunction = function(styleFunction) {
+ol.FeatureOverlay.prototype.setStyleFunction = function(styleFunction) {
   this.styleFunction_ = styleFunction;
   this.requestRenderFrame_();
 };
diff --git a/src/ol/interaction/drawinteraction.js b/src/ol/interaction/drawinteraction.js
index b1bef46f70..1de0958fd7 100644
--- a/src/ol/interaction/drawinteraction.js
+++ b/src/ol/interaction/drawinteraction.js
@@ -17,7 +17,7 @@ goog.require('ol.geom.MultiPolygon');
 goog.require('ol.geom.Point');
 goog.require('ol.geom.Polygon');
 goog.require('ol.interaction.Interaction');
-goog.require('ol.render.FeaturesOverlay');
+goog.require('ol.FeatureOverlay');
 goog.require('ol.source.Vector');
 goog.require('ol.style.Circle');
 goog.require('ol.style.Fill');
@@ -143,10 +143,10 @@ ol.interaction.Draw = function(opt_options) {
 
   /**
    * Draw overlay where are sketch features are drawn.
-   * @type {ol.render.FeaturesOverlay}
+   * @type {ol.FeatureOverlay}
    * @private
    */
-  this.overlay_ = new ol.render.FeaturesOverlay();
+  this.overlay_ = new ol.FeatureOverlay();
   this.overlay_.setStyleFunction(goog.isDef(opt_options.styleFunction) ?
       opt_options.styleFunction : ol.interaction.Draw.defaultStyleFunction
   );
diff --git a/src/ol/interaction/selectinteraction.js b/src/ol/interaction/selectinteraction.js
index c281c72929..db5b1e758a 100644
--- a/src/ol/interaction/selectinteraction.js
+++ b/src/ol/interaction/selectinteraction.js
@@ -4,7 +4,7 @@ goog.require('goog.array');
 goog.require('goog.functions');
 goog.require('ol.events.condition');
 goog.require('ol.interaction.Interaction');
-goog.require('ol.render.FeaturesOverlay');
+goog.require('ol.FeatureOverlay');
 
 
 
@@ -69,7 +69,7 @@ ol.interaction.Select = function(opt_options) {
 
   /**
    * @private
-   * @type {ol.render.FeaturesOverlay}
+   * @type {ol.FeatureOverlay}
    */
   this.featuresOverlay_ = options.featuresOverlay;
 
@@ -78,7 +78,7 @@ goog.inherits(ol.interaction.Select, ol.interaction.Interaction);
 
 
 /**
- * @return {ol.render.FeaturesOverlay} Features overlay.
+ * @return {ol.FeatureOverlay} Features overlay.
  * @todo stability experimental
  */
 ol.interaction.Select.prototype.getFeaturesOverlay = function() {