diff --git a/src/ol/feature.js b/src/ol/feature.js
index 0193470d28..f930fff6f8 100644
--- a/src/ol/feature.js
+++ b/src/ol/feature.js
@@ -12,7 +12,6 @@ goog.require('ol.style.Style');
  * @enum {string}
  */
 ol.FeatureProperty = {
-  GEOMETRY: 'geometry',
   STYLE_FUNCTION: 'styleFunction'
 };
 
@@ -44,7 +43,7 @@ ol.Feature = function(opt_geometryOrValues) {
    * @type {string}
    * @private
    */
-  this.geometryName_ = ol.FeatureProperty.GEOMETRY;
+  this.geometryName_ = 'geometry';
 
   /**
    * @private
@@ -59,7 +58,7 @@ ol.Feature = function(opt_geometryOrValues) {
   this.geometryChangeKey_ = null;
 
   goog.events.listen(
-      this, ol.Object.getChangeEventType(ol.FeatureProperty.GEOMETRY),
+      this, ol.Object.getChangeEventType(this.geometryName_),
       this.handleGeometryChanged_, false, this);
   goog.events.listen(
       this, ol.Object.getChangeEventType(ol.FeatureProperty.STYLE_FUNCTION),
diff --git a/test/spec/ol/feature.test.js b/test/spec/ol/feature.test.js
index d8df678645..afbf896ed9 100644
--- a/test/spec/ol/feature.test.js
+++ b/test/spec/ol/feature.test.js
@@ -155,7 +155,7 @@ describe('ol.Feature', function() {
     it('sets the default geometry', function() {
       var feature = new ol.Feature();
       feature.setGeometry(point);
-      expect(feature.get(ol.FeatureProperty.GEOMETRY)).to.be(point);
+      expect(feature.get('geometry')).to.be(point);
     });
 
     it('replaces previous default geometry', function() {