diff --git a/tools/cooja/java/se/sics/cooja/interfaces/ApplicationRadio.java b/tools/cooja/java/se/sics/cooja/interfaces/ApplicationRadio.java
index 8c06a8601..ab550ac3d 100644
--- a/tools/cooja/java/se/sics/cooja/interfaces/ApplicationRadio.java
+++ b/tools/cooja/java/se/sics/cooja/interfaces/ApplicationRadio.java
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: ApplicationRadio.java,v 1.7 2008/12/04 14:03:42 joxe Exp $
+ * $Id: ApplicationRadio.java,v 1.8 2009/03/09 14:08:54 fros4943 Exp $
  */
 
 package se.sics.cooja.interfaces;
@@ -45,7 +45,7 @@ import se.sics.cooja.*;
  * radio functionality. Supports radio channels and output power functionality.
  * The mote should observe the radio for incoming radio packet data.
  *
- * @author Fredrik Österlind
+ * @author Fredrik Osterlind
  */
 public class ApplicationRadio extends Radio implements PolledBeforeActiveTicks {
   private Mote myMote;
diff --git a/tools/cooja/java/se/sics/cooja/interfaces/Battery.java b/tools/cooja/java/se/sics/cooja/interfaces/Battery.java
index b20c92b5a..5067910dc 100644
--- a/tools/cooja/java/se/sics/cooja/interfaces/Battery.java
+++ b/tools/cooja/java/se/sics/cooja/interfaces/Battery.java
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: Battery.java,v 1.6 2008/10/28 13:28:35 fros4943 Exp $
+ * $Id: Battery.java,v 1.7 2009/03/09 14:08:54 fros4943 Exp $
  */
 
 package se.sics.cooja.interfaces;
@@ -54,7 +54,7 @@ import se.sics.cooja.*;
  * @see MoteInterface
  * @see MoteInterface#energyConsumption()
  *
- * @author Fredrik Österlind
+ * @author Fredrik Osterlind
  */
 @ClassDescription("Battery")
 public class Battery extends MoteInterface implements PolledAfterAllTicks {
diff --git a/tools/cooja/java/se/sics/cooja/interfaces/Clock.java b/tools/cooja/java/se/sics/cooja/interfaces/Clock.java
index 47ad6a75c..895ea13ab 100644
--- a/tools/cooja/java/se/sics/cooja/interfaces/Clock.java
+++ b/tools/cooja/java/se/sics/cooja/interfaces/Clock.java
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: Clock.java,v 1.4 2008/12/04 14:03:42 joxe Exp $
+ * $Id: Clock.java,v 1.5 2009/03/09 14:08:54 fros4943 Exp $
  */
 
 package se.sics.cooja.interfaces;
@@ -39,7 +39,7 @@ import se.sics.cooja.*;
  *
  * This observable never notifies.
  *
- * @author Fredrik Österlind
+ * @author Fredrik Osterlind
  */
 @ClassDescription("Clock")
 public abstract class Clock extends MoteInterface {
diff --git a/tools/cooja/java/se/sics/cooja/interfaces/PolledAfterActiveTicks.java b/tools/cooja/java/se/sics/cooja/interfaces/PolledAfterActiveTicks.java
index 50ebe45ba..dc422eae8 100644
--- a/tools/cooja/java/se/sics/cooja/interfaces/PolledAfterActiveTicks.java
+++ b/tools/cooja/java/se/sics/cooja/interfaces/PolledAfterActiveTicks.java
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: PolledAfterActiveTicks.java,v 1.1 2008/10/28 12:09:14 fros4943 Exp $
+ * $Id: PolledAfterActiveTicks.java,v 1.2 2009/03/09 14:08:54 fros4943 Exp $
  */
 
 package se.sics.cooja.interfaces;
@@ -38,7 +38,7 @@ import se.sics.cooja.contikimote.interfaces.ContikiLog;
  *
  * @see ContikiLog
  *
- * @author Fredrik Österlind
+ * @author Fredrik Osterlind
  */
 public interface PolledAfterActiveTicks {
   public void doActionsAfterTick();
diff --git a/tools/cooja/java/se/sics/cooja/interfaces/PolledAfterAllTicks.java b/tools/cooja/java/se/sics/cooja/interfaces/PolledAfterAllTicks.java
index 8a2641aae..f74813d7a 100644
--- a/tools/cooja/java/se/sics/cooja/interfaces/PolledAfterAllTicks.java
+++ b/tools/cooja/java/se/sics/cooja/interfaces/PolledAfterAllTicks.java
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: PolledAfterAllTicks.java,v 1.2 2008/10/28 12:30:48 fros4943 Exp $
+ * $Id: PolledAfterAllTicks.java,v 1.3 2009/03/09 14:08:54 fros4943 Exp $
  */
 
 package se.sics.cooja.interfaces;
@@ -36,7 +36,7 @@ package se.sics.cooja.interfaces;
  *
  * @see Battery
  *
- * @author Fredrik Österlind
+ * @author Fredrik Osterlind
  */
 public interface PolledAfterAllTicks {
   public void doActionsAfterTick();
diff --git a/tools/cooja/java/se/sics/cooja/interfaces/PolledBeforeActiveTicks.java b/tools/cooja/java/se/sics/cooja/interfaces/PolledBeforeActiveTicks.java
index b12e4a6ed..887568241 100644
--- a/tools/cooja/java/se/sics/cooja/interfaces/PolledBeforeActiveTicks.java
+++ b/tools/cooja/java/se/sics/cooja/interfaces/PolledBeforeActiveTicks.java
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: PolledBeforeActiveTicks.java,v 1.1 2008/10/28 12:09:14 fros4943 Exp $
+ * $Id: PolledBeforeActiveTicks.java,v 1.2 2009/03/09 14:08:54 fros4943 Exp $
  */
 
 package se.sics.cooja.interfaces;
@@ -38,7 +38,7 @@ import se.sics.cooja.contikimote.interfaces.ContikiClock;
  *
  * @see ContikiClock
  *
- * @author Fredrik Österlind
+ * @author Fredrik Osterlind
  */
 public interface PolledBeforeActiveTicks {
   public void doActionsBeforeTick();
diff --git a/tools/cooja/java/se/sics/cooja/interfaces/PolledBeforeAllTicks.java b/tools/cooja/java/se/sics/cooja/interfaces/PolledBeforeAllTicks.java
index ddbc28f1e..b49ddc416 100644
--- a/tools/cooja/java/se/sics/cooja/interfaces/PolledBeforeAllTicks.java
+++ b/tools/cooja/java/se/sics/cooja/interfaces/PolledBeforeAllTicks.java
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: PolledBeforeAllTicks.java,v 1.1 2008/10/28 12:09:14 fros4943 Exp $
+ * $Id: PolledBeforeAllTicks.java,v 1.2 2009/03/09 14:08:54 fros4943 Exp $
  */
 
 package se.sics.cooja.interfaces;
@@ -34,7 +34,7 @@ package se.sics.cooja.interfaces;
 /**
  * A mote interface polled before ALL mote ticks.
  *
- * @author Fredrik Österlind
+ * @author Fredrik Osterlind
  */
 public interface PolledBeforeAllTicks {
   public void doActionsBeforeTick();
diff --git a/tools/cooja/java/se/sics/cooja/interfaces/Position.java b/tools/cooja/java/se/sics/cooja/interfaces/Position.java
index 9361b386d..585ad256a 100644
--- a/tools/cooja/java/se/sics/cooja/interfaces/Position.java
+++ b/tools/cooja/java/se/sics/cooja/interfaces/Position.java
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: Position.java,v 1.4 2008/10/28 12:59:30 fros4943 Exp $
+ * $Id: Position.java,v 1.5 2009/03/09 14:08:54 fros4943 Exp $
  */
 
 package se.sics.cooja.interfaces;
@@ -45,7 +45,7 @@ import se.sics.cooja.*;
  * <p>
  * This observable notifies when the position is changed.
  *
- * @author Fredrik Österlind
+ * @author Fredrik Osterlind
  */
 @ClassDescription("Position")
 public class Position extends MoteInterface {