diff --git a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/ESBMote.java b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/ESBMote.java
index 24ecd1edf..f2e4ca440 100644
--- a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/ESBMote.java
+++ b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/ESBMote.java
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: ESBMote.java,v 1.7 2009/03/09 17:12:27 fros4943 Exp $
+ * $Id: ESBMote.java,v 1.8 2009/04/20 16:12:01 fros4943 Exp $
  */
 
 package se.sics.cooja.mspmote;
@@ -71,16 +71,6 @@ public class ESBMote extends MspMote {
     MoteInterfaceHandler moteInterfaceHandler =
       super.createMoteInterfaceHandler();
 
-    /* TODO check if uIP is used, remove IPv4 interface otherwise */
-//    moteInterfaceHandler.getIPAddress()
-//    try {
-//      if (((MspMoteMemory)this.getMemory()).getVariableAddress("uip_hostaddr") != 0) {
-//        IPAddress ip = new MspIPAddress(this);
-//        moteInterfaceHandler.addInterface(ip);
-//      }
-//    } catch (UnknownVariableException e) {
-//    }
-
     return moteInterfaceHandler;
   }
 
diff --git a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/ESBMoteType.java b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/ESBMoteType.java
index aa1226c19..3e88ae1c3 100644
--- a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/ESBMoteType.java
+++ b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/ESBMoteType.java
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: ESBMoteType.java,v 1.9 2009/03/12 15:12:10 fros4943 Exp $
+ * $Id: ESBMoteType.java,v 1.10 2009/04/20 16:12:01 fros4943 Exp $
  */
 
 package se.sics.cooja.mspmote;
@@ -41,13 +41,14 @@ import se.sics.cooja.*;
 import se.sics.cooja.dialogs.CompileContiki;
 import se.sics.cooja.dialogs.MessageList;
 import se.sics.cooja.dialogs.MessageList.MessageContainer;
+import se.sics.cooja.interfaces.IPAddress;
 import se.sics.cooja.interfaces.Mote2MoteRelations;
 import se.sics.cooja.interfaces.Position;
+import se.sics.cooja.interfaces.RimeAddress;
 import se.sics.cooja.mspmote.interfaces.ESBButton;
 import se.sics.cooja.mspmote.interfaces.ESBLED;
 import se.sics.cooja.mspmote.interfaces.ESBLog;
 import se.sics.cooja.mspmote.interfaces.MspClock;
-import se.sics.cooja.mspmote.interfaces.MspIPAddress;
 import se.sics.cooja.mspmote.interfaces.MspMoteID;
 import se.sics.cooja.mspmote.interfaces.TR1001Radio;
 
@@ -189,7 +190,8 @@ public class ESBMoteType extends MspMoteType {
   public Class<? extends MoteInterface>[] getAllMoteInterfaceClasses() {
     return new Class[] {
         Position.class,
-        MspIPAddress.class,
+        RimeAddress.class,
+        IPAddress.class,
         ESBLog.class,
         MspClock.class,
         ESBLED.class,
diff --git a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/SkyMote.java b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/SkyMote.java
index 03945c4ab..36e9029b2 100644
--- a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/SkyMote.java
+++ b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/SkyMote.java
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: SkyMote.java,v 1.13 2009/03/09 17:12:27 fros4943 Exp $
+ * $Id: SkyMote.java,v 1.14 2009/04/20 16:12:01 fros4943 Exp $
  */
 
 package se.sics.cooja.mspmote;
@@ -71,16 +71,6 @@ public class SkyMote extends MspMote {
     MoteInterfaceHandler moteInterfaceHandler =
       super.createMoteInterfaceHandler();
 
-    /* TODO check if uIP is used, remove IPv4 interface otherwise */
-//    moteInterfaceHandler.getIPAddress()
-//    try {
-//      if (((MspMoteMemory)this.getMemory()).getVariableAddress("uip_hostaddr") != 0) {
-//        IPAddress ip = new MspIPAddress(this);
-//        moteInterfaceHandler.addInterface(ip);
-//      }
-//    } catch (UnknownVariableException e) {
-//    }
-
     return moteInterfaceHandler;
   }
 
diff --git a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/SkyMoteType.java b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/SkyMoteType.java
index 797a7d8e7..d6a95d517 100644
--- a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/SkyMoteType.java
+++ b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/SkyMoteType.java
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: SkyMoteType.java,v 1.8 2009/03/12 15:12:10 fros4943 Exp $
+ * $Id: SkyMoteType.java,v 1.9 2009/04/20 16:12:01 fros4943 Exp $
  */
 
 package se.sics.cooja.mspmote;
@@ -41,10 +41,11 @@ import se.sics.cooja.*;
 import se.sics.cooja.dialogs.CompileContiki;
 import se.sics.cooja.dialogs.MessageList;
 import se.sics.cooja.dialogs.MessageList.MessageContainer;
+import se.sics.cooja.interfaces.IPAddress;
 import se.sics.cooja.interfaces.Mote2MoteRelations;
 import se.sics.cooja.interfaces.Position;
+import se.sics.cooja.interfaces.RimeAddress;
 import se.sics.cooja.mspmote.interfaces.MspClock;
-import se.sics.cooja.mspmote.interfaces.MspIPAddress;
 import se.sics.cooja.mspmote.interfaces.MspMoteID;
 import se.sics.cooja.mspmote.interfaces.SkyButton;
 import se.sics.cooja.mspmote.interfaces.SkyByteRadio;
@@ -190,7 +191,8 @@ public class SkyMoteType extends MspMoteType {
   public Class<? extends MoteInterface>[] getAllMoteInterfaceClasses() {
     return new Class[] {
         Position.class,
-        MspIPAddress.class,
+        RimeAddress.class,
+        IPAddress.class,
         Mote2MoteRelations.class,
         MspClock.class,
         MspMoteID.class,