diff --git a/src/ol/object.js b/src/ol/object.js
index 859e9ad6e8..96ef0bcb5c 100644
--- a/src/ol/object.js
+++ b/src/ol/object.js
@@ -21,7 +21,7 @@ goog.require('ol.Observable');
  * @enum {string}
  */
 ol.ObjectEventType = {
-  BEFORECHANGE: 'beforechange',
+  BEFOREPROPERTYCHANGE: 'beforepropertychange',
   PROPERTYCHANGE: 'propertychange'
 };
 
@@ -258,7 +258,7 @@ ol.Object.prototype.bindTo = function(key, target, opt_targetKey) {
 
   // listen for beforechange events and relay if key matches
   this.beforeChangeListeners_[key] = goog.events.listen(target,
-      ol.ObjectEventType.BEFORECHANGE,
+      ol.ObjectEventType.BEFOREPROPERTYCHANGE,
       this.createBeforeChangeListener_(key, targetKey),
       undefined, this);
 
@@ -288,7 +288,7 @@ ol.Object.prototype.createBeforeChangeListener_ = function(key, targetKey) {
   return function(event) {
     if (event.key === targetKey) {
       this.dispatchEvent(
-          new ol.ObjectEvent(ol.ObjectEventType.BEFORECHANGE, key));
+          new ol.ObjectEvent(ol.ObjectEventType.BEFOREPROPERTYCHANGE, key));
     }
   };
 };
@@ -408,7 +408,8 @@ ol.Object.prototype.notifyInternal_ = function(key) {
  * @todo stability experimental
  */
 ol.Object.prototype.set = function(key, value) {
-  this.dispatchEvent(new ol.ObjectEvent(ol.ObjectEventType.BEFORECHANGE, key));
+  this.dispatchEvent(
+      new ol.ObjectEvent(ol.ObjectEventType.BEFOREPROPERTYCHANGE, key));
   var accessors = ol.Object.getAccessors(this);
   if (accessors.hasOwnProperty(key)) {
     var accessor = accessors[key];
diff --git a/test/spec/ol/object.test.js b/test/spec/ol/object.test.js
index 794a7f0d43..78938d8bbc 100644
--- a/test/spec/ol/object.test.js
+++ b/test/spec/ol/object.test.js
@@ -175,7 +175,7 @@ describe('ol.Object', function() {
       var beforeListener = sinon.spy(function(event) {
         oldValue = o2.get(event.key);
       });
-      o.on(ol.ObjectEventType.BEFORECHANGE, beforeListener);
+      o.on(ol.ObjectEventType.BEFOREPROPERTYCHANGE, beforeListener);
 
       o.set('k', 2);
       expect(beforeListener.calledOnce).to.be(true);
@@ -211,7 +211,7 @@ describe('ol.Object', function() {
       var beforeListener = sinon.spy(function(event) {
         oldValue = o2.get(event.key);
       });
-      o.on(ol.ObjectEventType.BEFORECHANGE, beforeListener);
+      o.on(ol.ObjectEventType.BEFOREPROPERTYCHANGE, beforeListener);
 
       o2.set('k', 2);
       expect(beforeListener.calledOnce).to.be(true);
@@ -234,7 +234,7 @@ describe('ol.Object', function() {
       var beforeListener = sinon.spy(function(event) {
         oldValue = object.get(event.key);
       });
-      object.on(ol.ObjectEventType.BEFORECHANGE, beforeListener);
+      object.on(ol.ObjectEventType.BEFOREPROPERTYCHANGE, beforeListener);
 
       target.set('foo', 'new value');
       expect(beforeListener.calledOnce).to.be(true);
@@ -258,7 +258,7 @@ describe('ol.Object', function() {
       var beforeListener = sinon.spy(function(event) {
         oldValue = object.get(event.key);
       });
-      object.on(ol.ObjectEventType.BEFORECHANGE, beforeListener);
+      object.on(ol.ObjectEventType.BEFOREPROPERTYCHANGE, beforeListener);
 
       target.set('foo', 'new value');
       expect(beforeListener.calledOnce).to.be(true);
@@ -359,7 +359,7 @@ describe('ol.Object', function() {
       object.bindTo('foo', target);
 
       var listener = sinon.spy();
-      object.on(ol.ObjectEventType.BEFORECHANGE, listener);
+      object.on(ol.ObjectEventType.BEFOREPROPERTYCHANGE, listener);
 
       target.set('foo', 'new value');
       expect(listener.calledOnce).to.be(true);
@@ -384,7 +384,7 @@ describe('ol.Object', function() {
       object.bindTo('bar', target);
 
       var listener = sinon.spy();
-      object.on(ol.ObjectEventType.BEFORECHANGE, listener);
+      object.on(ol.ObjectEventType.BEFOREPROPERTYCHANGE, listener);
 
       target.set('foo', 'new foo');
       expect(listener.calledOnce).to.be(true);