diff --git a/tools/cooja/java/se/sics/cooja/contikimote/ContikiMoteInterface.java b/tools/cooja/java/se/sics/cooja/contikimote/ContikiMoteInterface.java
index 70719e37a..723b963b0 100644
--- a/tools/cooja/java/se/sics/cooja/contikimote/ContikiMoteInterface.java
+++ b/tools/cooja/java/se/sics/cooja/contikimote/ContikiMoteInterface.java
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: ContikiMoteInterface.java,v 1.2 2008/10/28 12:05:30 fros4943 Exp $
+ * $Id: ContikiMoteInterface.java,v 1.3 2009/02/25 14:46:25 fros4943 Exp $
  */
 
 package se.sics.cooja.contikimote;
@@ -40,7 +40,7 @@ package se.sics.cooja.contikimote;
  *
  * The method should return the names of all needed core interfaces.
  *
- * @author Fredrik Österlind
+ * @author Fredrik Osterlind
  */
 public interface ContikiMoteInterface {
   /*public static String[] getCoreInterfaceDependencies();*/
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 67979aa0a..509ffe88e 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.8 2008/12/04 14:03:42 joxe Exp $
+ * $Id: ContikiBeeper.java,v 1.9 2009/02/25 14:46:24 fros4943 Exp $
  */
 
 package se.sics.cooja.contikimote.interfaces;
@@ -60,7 +60,7 @@ import se.sics.cooja.interfaces.PolledAfterActiveTicks;
  *
  * This observable is changed and notifies observers when the mote beeps.
  *
- * @author Fredrik Österlind
+ * @author Fredrik Osterlind
  */
 public class ContikiBeeper extends Beeper implements ContikiMoteInterface, PolledAfterActiveTicks {
   private Mote mote = null;
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 944602d23..f9fbf6324 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.11 2009/01/21 14:31:12 fros4943 Exp $
+ * $Id: ContikiButton.java,v 1.12 2009/02/25 14:46:24 fros4943 Exp $
  */
 
 package se.sics.cooja.contikimote.interfaces;
@@ -59,7 +59,7 @@ import se.sics.cooja.interfaces.Button;
  *
  * This observable notifies when the button is pressed or released.
  *
- * @author Fredrik Österlind
+ * @author Fredrik Osterlind
  */
 public class ContikiButton extends Button implements ContikiMoteInterface {
   private SectionMoteMemory moteMem;
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 eb97ef94e..199c006f8 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.8 2008/12/04 14:03:42 joxe Exp $
+ * $Id: ContikiCFS.java,v 1.9 2009/02/25 14:46:24 fros4943 Exp $
  */
 
 package se.sics.cooja.contikimote.interfaces;
@@ -64,7 +64,7 @@ import se.sics.cooja.interfaces.PolledAfterActiveTicks;
  * <p>
  * This observable notifies when the filesystem is used (read/write).
  *
- * @author Fredrik Österlind
+ * @author Fredrik Osterlind
  */
 @ClassDescription("Filesystem (CFS)")
 public class ContikiCFS extends MoteInterface implements ContikiMoteInterface, PolledAfterActiveTicks {
diff --git a/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiClock.java b/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiClock.java
index 12e420d30..65efc7cab 100644
--- a/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiClock.java
+++ b/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiClock.java
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: ContikiClock.java,v 1.7 2008/12/04 14:03:42 joxe Exp $
+ * $Id: ContikiClock.java,v 1.8 2009/02/25 14:46:24 fros4943 Exp $
  */
 
 package se.sics.cooja.contikimote.interfaces;
@@ -56,7 +56,7 @@ import se.sics.cooja.interfaces.PolledBeforeActiveTicks;
  *
  * This observable never notifies.
  *
- * @author Fredrik Österlind
+ * @author Fredrik Osterlind
  */
 public class ContikiClock extends Clock implements ContikiMoteInterface, PolledBeforeActiveTicks {
 
diff --git a/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiIPAddress.java b/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiIPAddress.java
index 3a674071b..606e70f68 100644
--- a/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiIPAddress.java
+++ b/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiIPAddress.java
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: ContikiIPAddress.java,v 1.4 2008/10/28 12:55:20 fros4943 Exp $
+ * $Id: ContikiIPAddress.java,v 1.5 2009/02/25 14:46:24 fros4943 Exp $
  */
 
 package se.sics.cooja.contikimote.interfaces;
@@ -63,7 +63,7 @@ import se.sics.cooja.interfaces.IPAddress;
  *
  * This observable notifies when the IP address is set or altered.
  *
- * @author Fredrik Österlind
+ * @author Fredrik Osterlind
  */
 public class ContikiIPAddress extends IPAddress implements ContikiMoteInterface {
   private SectionMoteMemory moteMem = null;
diff --git a/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiLED.java b/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiLED.java
index 7a9dee78c..cb4cd6931 100644
--- a/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiLED.java
+++ b/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiLED.java
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: ContikiLED.java,v 1.6 2008/10/28 12:55:20 fros4943 Exp $
+ * $Id: ContikiLED.java,v 1.7 2009/02/25 14:46:24 fros4943 Exp $
  */
 
 package se.sics.cooja.contikimote.interfaces;
@@ -59,7 +59,7 @@ import se.sics.cooja.interfaces.PolledAfterActiveTicks;
  *
  * This observable notifies when any LED changes.
  *
- * @author Fredrik Österlind
+ * @author Fredrik Osterlind
  */
 public class ContikiLED extends LED implements ContikiMoteInterface, PolledAfterActiveTicks {
   private static Logger logger = Logger.getLogger(ContikiLED.class);
diff --git a/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiLog.java b/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiLog.java
index 296adf02a..47f3fc50c 100644
--- a/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiLog.java
+++ b/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiLog.java
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: ContikiLog.java,v 1.7 2008/10/28 12:55:20 fros4943 Exp $
+ * $Id: ContikiLog.java,v 1.8 2009/02/25 14:46:24 fros4943 Exp $
  */
 
 package se.sics.cooja.contikimote.interfaces;
@@ -63,7 +63,7 @@ import se.sics.cooja.interfaces.PolledAfterActiveTicks;
  *
  * This observable notifies at new mote log output.
  *
- * @author Fredrik Österlind
+ * @author Fredrik Osterlind
  */
 public class ContikiLog extends Log implements ContikiMoteInterface, PolledAfterActiveTicks {
   private static Logger logger = Logger.getLogger(ContikiLog.class);
diff --git a/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiMoteID.java b/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiMoteID.java
index 3c292ae13..c49091600 100644
--- a/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiMoteID.java
+++ b/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiMoteID.java
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: ContikiMoteID.java,v 1.5 2008/10/28 12:55:20 fros4943 Exp $
+ * $Id: ContikiMoteID.java,v 1.6 2009/02/25 14:46:24 fros4943 Exp $
  */
 
 package se.sics.cooja.contikimote.interfaces;
@@ -58,7 +58,7 @@ import se.sics.cooja.interfaces.MoteID;
  *
  * This observable notifies observers when the mote ID is set or altered.
  *
- * @author Fredrik Österlind
+ * @author Fredrik Osterlind
  */
 public class ContikiMoteID extends MoteID implements ContikiMoteInterface {
   private SectionMoteMemory moteMem = null;
diff --git a/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiPIR.java b/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiPIR.java
index 9a88d3f59..9b118bcbc 100644
--- a/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiPIR.java
+++ b/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiPIR.java
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: ContikiPIR.java,v 1.5 2008/10/28 12:55:20 fros4943 Exp $
+ * $Id: ContikiPIR.java,v 1.6 2009/02/25 14:46:24 fros4943 Exp $
  */
 
 package se.sics.cooja.contikimote.interfaces;
@@ -59,7 +59,7 @@ import se.sics.cooja.interfaces.PIR;
  *
  * This observable notifies if PIR triggers.
  *
- * @author Fredrik Österlind
+ * @author Fredrik Osterlind
  */
 public class ContikiPIR extends PIR implements ContikiMoteInterface {
   private static Logger logger = Logger.getLogger(ContikiPIR.class);
diff --git a/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiRadio.java b/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiRadio.java
index 1958210e7..a697e4fa2 100644
--- a/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiRadio.java
+++ b/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiRadio.java
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: ContikiRadio.java,v 1.25 2009/02/24 15:09:07 fros4943 Exp $
+ * $Id: ContikiRadio.java,v 1.26 2009/02/25 14:46:22 fros4943 Exp $
  */
 
 package se.sics.cooja.contikimote.interfaces;
@@ -83,7 +83,7 @@ import se.sics.cooja.radiomediums.UDGM;
  * @see #getLastEvent()
  * @see UDGM
  *
- * @author Fredrik Österlind
+ * @author Fredrik Osterlind
  */
 public class ContikiRadio extends Radio implements ContikiMoteInterface, PolledAfterActiveTicks {
   private Mote myMote;
diff --git a/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiVib.java b/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiVib.java
index e20f1f755..eab626ab7 100644
--- a/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiVib.java
+++ b/tools/cooja/java/se/sics/cooja/contikimote/interfaces/ContikiVib.java
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: ContikiVib.java,v 1.5 2008/10/28 12:55:20 fros4943 Exp $
+ * $Id: ContikiVib.java,v 1.6 2009/02/25 14:46:24 fros4943 Exp $
  */
 
 package se.sics.cooja.contikimote.interfaces;
@@ -58,7 +58,7 @@ import se.sics.cooja.contikimote.ContikiMoteInterface;
  *
  * This observable never notifies.
  *
- * @author Fredrik Österlind
+ * @author Fredrik Osterlind
  */
 @ClassDescription("Vibration sensor")
 public class ContikiVib extends MoteInterface implements ContikiMoteInterface {