diff --git a/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiBeeper.java b/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiBeeper.java
index ef8bef35b..ab14ce111 100644
--- a/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiBeeper.java
+++ b/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiBeeper.java
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: ContikiBeeper.java,v 1.6 2008/10/28 12:55:20 fros4943 Exp $
+ * $Id: ContikiBeeper.java,v 1.7 2008/10/28 13:37:11 fros4943 Exp $
  */
 
 package se.sics.cooja.contikimote.interfaces;
@@ -117,7 +117,7 @@ public class ContikiBeeper extends Beeper implements ContikiMoteInterface, Polle
       moteMem.setByteValueOf("simBeeped", (byte) 0);
 
       /* Schedule stop beeping (reset energy consumption) */
-      mote.getSimulation().addEvent(stopBeepEvent, mote.getSimulation().getSimulationTime());
+      mote.getSimulation().scheduleEvent(stopBeepEvent, mote.getSimulation().getSimulationTime());
     }
   }
 
diff --git a/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiButton.java b/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiButton.java
index 39d13853d..8227eb01a 100644
--- a/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiButton.java
+++ b/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiButton.java
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: ContikiButton.java,v 1.8 2008/10/28 12:55:20 fros4943 Exp $
+ * $Id: ContikiButton.java,v 1.9 2008/10/28 13:37:11 fros4943 Exp $
  */
 
 package se.sics.cooja.contikimote.interfaces;
@@ -96,7 +96,7 @@ public class ContikiButton extends Button implements ContikiMoteInterface {
         releaseButton();
       } else {
         /* Reschedule button release */
-        mote.getSimulation().addEvent(releaseButtonEvent, t+1);
+        mote.getSimulation().scheduleEvent(releaseButtonEvent, t+1);
       }
     }
   };
@@ -108,7 +108,7 @@ public class ContikiButton extends Button implements ContikiMoteInterface {
     pressButton();
 
     /* Schedule release button */
-    mote.getSimulation().addEvent(releaseButtonEvent, mote.getSimulation().getSimulationTime());
+    mote.getSimulation().scheduleEvent(releaseButtonEvent, mote.getSimulation().getSimulationTime());
   }
 
   public void releaseButton() {
diff --git a/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiCFS.java b/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiCFS.java
index 304163f7e..9f03f9095 100644
--- a/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiCFS.java
+++ b/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiCFS.java
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: ContikiCFS.java,v 1.6 2008/10/28 12:55:20 fros4943 Exp $
+ * $Id: ContikiCFS.java,v 1.7 2008/10/28 13:37:11 fros4943 Exp $
  */
 
 package se.sics.cooja.contikimote.interfaces;
@@ -132,7 +132,7 @@ public class ContikiCFS extends MoteInterface implements ContikiMoteInterface, P
       this.notifyObservers(mote);
 
       /* Reset energy consumption */
-      mote.getSimulation().addEvent(doneEvent, mote.getSimulation().getSimulationTime());
+      mote.getSimulation().scheduleEvent(doneEvent, mote.getSimulation().getSimulationTime());
     }
   }