diff --git a/regression-tests/11-ipv6/17-cooja-multicast-11-hops.csc b/regression-tests/11-ipv6/17-cooja-multicast-11-hops.csc
index b98f77678..da90cb72b 100644
--- a/regression-tests/11-ipv6/17-cooja-multicast-11-hops.csc
+++ b/regression-tests/11-ipv6/17-cooja-multicast-11-hops.csc
@@ -11,7 +11,7 @@
123456
1000000
- se.sics.cooja.radiomediums.UDGM
+ org.contikios.cooja.radiomediums.UDGM
15.0
0.0
1.0
@@ -21,284 +21,284 @@
40000
- se.sics.cooja.contikimote.ContikiMoteType
+ org.contikios.cooja.contikimote.ContikiMoteType
mtype612
Root/sender
make root.cooja TARGET=cooja
- se.sics.cooja.interfaces.Position
- se.sics.cooja.interfaces.Battery
- se.sics.cooja.contikimote.interfaces.ContikiVib
- se.sics.cooja.contikimote.interfaces.ContikiMoteID
- se.sics.cooja.contikimote.interfaces.ContikiRS232
- se.sics.cooja.contikimote.interfaces.ContikiBeeper
- se.sics.cooja.interfaces.RimeAddress
- se.sics.cooja.contikimote.interfaces.ContikiIPAddress
- se.sics.cooja.contikimote.interfaces.ContikiRadio
- se.sics.cooja.contikimote.interfaces.ContikiButton
- se.sics.cooja.contikimote.interfaces.ContikiPIR
- se.sics.cooja.contikimote.interfaces.ContikiClock
- se.sics.cooja.contikimote.interfaces.ContikiLED
- se.sics.cooja.contikimote.interfaces.ContikiCFS
- se.sics.cooja.interfaces.Mote2MoteRelations
- se.sics.cooja.interfaces.MoteAttributes
+ org.contikios.cooja.interfaces.Position
+ org.contikios.cooja.interfaces.Battery
+ org.contikios.cooja.contikimote.interfaces.ContikiVib
+ org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+ org.contikios.cooja.contikimote.interfaces.ContikiRS232
+ org.contikios.cooja.contikimote.interfaces.ContikiBeeper
+ org.contikios.cooja.interfaces.RimeAddress
+ org.contikios.cooja.contikimote.interfaces.ContikiIPAddress
+ org.contikios.cooja.contikimote.interfaces.ContikiRadio
+ org.contikios.cooja.contikimote.interfaces.ContikiButton
+ org.contikios.cooja.contikimote.interfaces.ContikiPIR
+ org.contikios.cooja.contikimote.interfaces.ContikiClock
+ org.contikios.cooja.contikimote.interfaces.ContikiLED
+ org.contikios.cooja.contikimote.interfaces.ContikiCFS
+ org.contikios.cooja.interfaces.Mote2MoteRelations
+ org.contikios.cooja.interfaces.MoteAttributes
false
- se.sics.cooja.contikimote.ContikiMoteType
+ org.contikios.cooja.contikimote.ContikiMoteType
mtype890
Intermediate
make intermediate.cooja TARGET=cooja
- se.sics.cooja.interfaces.Position
- se.sics.cooja.interfaces.Battery
- se.sics.cooja.contikimote.interfaces.ContikiVib
- se.sics.cooja.contikimote.interfaces.ContikiMoteID
- se.sics.cooja.contikimote.interfaces.ContikiRS232
- se.sics.cooja.contikimote.interfaces.ContikiBeeper
- se.sics.cooja.interfaces.RimeAddress
- se.sics.cooja.contikimote.interfaces.ContikiIPAddress
- se.sics.cooja.contikimote.interfaces.ContikiRadio
- se.sics.cooja.contikimote.interfaces.ContikiButton
- se.sics.cooja.contikimote.interfaces.ContikiPIR
- se.sics.cooja.contikimote.interfaces.ContikiClock
- se.sics.cooja.contikimote.interfaces.ContikiLED
- se.sics.cooja.contikimote.interfaces.ContikiCFS
- se.sics.cooja.interfaces.Mote2MoteRelations
- se.sics.cooja.interfaces.MoteAttributes
+ org.contikios.cooja.interfaces.Position
+ org.contikios.cooja.interfaces.Battery
+ org.contikios.cooja.contikimote.interfaces.ContikiVib
+ org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+ org.contikios.cooja.contikimote.interfaces.ContikiRS232
+ org.contikios.cooja.contikimote.interfaces.ContikiBeeper
+ org.contikios.cooja.interfaces.RimeAddress
+ org.contikios.cooja.contikimote.interfaces.ContikiIPAddress
+ org.contikios.cooja.contikimote.interfaces.ContikiRadio
+ org.contikios.cooja.contikimote.interfaces.ContikiButton
+ org.contikios.cooja.contikimote.interfaces.ContikiPIR
+ org.contikios.cooja.contikimote.interfaces.ContikiClock
+ org.contikios.cooja.contikimote.interfaces.ContikiLED
+ org.contikios.cooja.contikimote.interfaces.ContikiCFS
+ org.contikios.cooja.interfaces.Mote2MoteRelations
+ org.contikios.cooja.interfaces.MoteAttributes
false
- se.sics.cooja.contikimote.ContikiMoteType
+ org.contikios.cooja.contikimote.ContikiMoteType
mtype956
Receiver
make sink.cooja TARGET=cooja
- se.sics.cooja.interfaces.Position
- se.sics.cooja.interfaces.Battery
- se.sics.cooja.contikimote.interfaces.ContikiVib
- se.sics.cooja.contikimote.interfaces.ContikiMoteID
- se.sics.cooja.contikimote.interfaces.ContikiRS232
- se.sics.cooja.contikimote.interfaces.ContikiBeeper
- se.sics.cooja.interfaces.RimeAddress
- se.sics.cooja.contikimote.interfaces.ContikiIPAddress
- se.sics.cooja.contikimote.interfaces.ContikiRadio
- se.sics.cooja.contikimote.interfaces.ContikiButton
- se.sics.cooja.contikimote.interfaces.ContikiPIR
- se.sics.cooja.contikimote.interfaces.ContikiClock
- se.sics.cooja.contikimote.interfaces.ContikiLED
- se.sics.cooja.contikimote.interfaces.ContikiCFS
- se.sics.cooja.interfaces.Mote2MoteRelations
- se.sics.cooja.interfaces.MoteAttributes
+ org.contikios.cooja.interfaces.Position
+ org.contikios.cooja.interfaces.Battery
+ org.contikios.cooja.contikimote.interfaces.ContikiVib
+ org.contikios.cooja.contikimote.interfaces.ContikiMoteID
+ org.contikios.cooja.contikimote.interfaces.ContikiRS232
+ org.contikios.cooja.contikimote.interfaces.ContikiBeeper
+ org.contikios.cooja.interfaces.RimeAddress
+ org.contikios.cooja.contikimote.interfaces.ContikiIPAddress
+ org.contikios.cooja.contikimote.interfaces.ContikiRadio
+ org.contikios.cooja.contikimote.interfaces.ContikiButton
+ org.contikios.cooja.contikimote.interfaces.ContikiPIR
+ org.contikios.cooja.contikimote.interfaces.ContikiClock
+ org.contikios.cooja.contikimote.interfaces.ContikiLED
+ org.contikios.cooja.contikimote.interfaces.ContikiCFS
+ org.contikios.cooja.interfaces.Mote2MoteRelations
+ org.contikios.cooja.interfaces.MoteAttributes
false
- se.sics.cooja.interfaces.Position
+ org.contikios.cooja.interfaces.Position
-7.983976888750106
0.37523218201044733
0.0
- se.sics.cooja.contikimote.interfaces.ContikiMoteID
+ org.contikios.cooja.contikimote.interfaces.ContikiMoteID
1
- se.sics.cooja.contikimote.interfaces.ContikiRadio
+ org.contikios.cooja.contikimote.interfaces.ContikiRadio
250.0
mtype612
- se.sics.cooja.interfaces.Position
+ org.contikios.cooja.interfaces.Position
0.0
0.0
0.0
- se.sics.cooja.contikimote.interfaces.ContikiMoteID
+ org.contikios.cooja.contikimote.interfaces.ContikiMoteID
2
- se.sics.cooja.contikimote.interfaces.ContikiRadio
+ org.contikios.cooja.contikimote.interfaces.ContikiRadio
250.0
mtype890
- se.sics.cooja.interfaces.Position
+ org.contikios.cooja.interfaces.Position
10.0
0.0
0.0
- se.sics.cooja.contikimote.interfaces.ContikiMoteID
+ org.contikios.cooja.contikimote.interfaces.ContikiMoteID
3
- se.sics.cooja.contikimote.interfaces.ContikiRadio
+ org.contikios.cooja.contikimote.interfaces.ContikiRadio
250.0
mtype890
- se.sics.cooja.interfaces.Position
+ org.contikios.cooja.interfaces.Position
20.0
0.0
0.0
- se.sics.cooja.contikimote.interfaces.ContikiMoteID
+ org.contikios.cooja.contikimote.interfaces.ContikiMoteID
4
- se.sics.cooja.contikimote.interfaces.ContikiRadio
+ org.contikios.cooja.contikimote.interfaces.ContikiRadio
250.0
mtype890
- se.sics.cooja.interfaces.Position
+ org.contikios.cooja.interfaces.Position
30.0
0.0
0.0
- se.sics.cooja.contikimote.interfaces.ContikiMoteID
+ org.contikios.cooja.contikimote.interfaces.ContikiMoteID
5
- se.sics.cooja.contikimote.interfaces.ContikiRadio
+ org.contikios.cooja.contikimote.interfaces.ContikiRadio
250.0
mtype890
- se.sics.cooja.interfaces.Position
+ org.contikios.cooja.interfaces.Position
40.0
0.0
0.0
- se.sics.cooja.contikimote.interfaces.ContikiMoteID
+ org.contikios.cooja.contikimote.interfaces.ContikiMoteID
6
- se.sics.cooja.contikimote.interfaces.ContikiRadio
+ org.contikios.cooja.contikimote.interfaces.ContikiRadio
250.0
mtype890
- se.sics.cooja.interfaces.Position
+ org.contikios.cooja.interfaces.Position
50.0
0.0
0.0
- se.sics.cooja.contikimote.interfaces.ContikiMoteID
+ org.contikios.cooja.contikimote.interfaces.ContikiMoteID
7
- se.sics.cooja.contikimote.interfaces.ContikiRadio
+ org.contikios.cooja.contikimote.interfaces.ContikiRadio
250.0
mtype890
- se.sics.cooja.interfaces.Position
+ org.contikios.cooja.interfaces.Position
60.0
0.0
0.0
- se.sics.cooja.contikimote.interfaces.ContikiMoteID
+ org.contikios.cooja.contikimote.interfaces.ContikiMoteID
8
- se.sics.cooja.contikimote.interfaces.ContikiRadio
+ org.contikios.cooja.contikimote.interfaces.ContikiRadio
250.0
mtype890
- se.sics.cooja.interfaces.Position
+ org.contikios.cooja.interfaces.Position
70.0
0.0
0.0
- se.sics.cooja.contikimote.interfaces.ContikiMoteID
+ org.contikios.cooja.contikimote.interfaces.ContikiMoteID
9
- se.sics.cooja.contikimote.interfaces.ContikiRadio
+ org.contikios.cooja.contikimote.interfaces.ContikiRadio
250.0
mtype890
- se.sics.cooja.interfaces.Position
+ org.contikios.cooja.interfaces.Position
79.93950307524713
-0.043451055913349
0.0
- se.sics.cooja.contikimote.interfaces.ContikiMoteID
+ org.contikios.cooja.contikimote.interfaces.ContikiMoteID
10
- se.sics.cooja.contikimote.interfaces.ContikiRadio
+ org.contikios.cooja.contikimote.interfaces.ContikiRadio
250.0
mtype890
- se.sics.cooja.interfaces.Position
+ org.contikios.cooja.interfaces.Position
90.0
0.0
0.0
- se.sics.cooja.contikimote.interfaces.ContikiMoteID
+ org.contikios.cooja.contikimote.interfaces.ContikiMoteID
11
- se.sics.cooja.contikimote.interfaces.ContikiRadio
+ org.contikios.cooja.contikimote.interfaces.ContikiRadio
250.0
mtype890
- se.sics.cooja.interfaces.Position
+ org.contikios.cooja.interfaces.Position
99.61761525766555
0.37523218201044733
0.0
- se.sics.cooja.contikimote.interfaces.ContikiMoteID
+ org.contikios.cooja.contikimote.interfaces.ContikiMoteID
12
- se.sics.cooja.contikimote.interfaces.ContikiRadio
+ org.contikios.cooja.contikimote.interfaces.ContikiRadio
250.0
mtype956
- se.sics.cooja.plugins.SimControl
+ org.contikios.cooja.plugins.SimControl
280
1
160
@@ -306,14 +306,14 @@
0
- se.sics.cooja.plugins.Visualizer
+ org.contikios.cooja.plugins.Visualizer
true
- se.sics.cooja.plugins.skins.IDVisualizerSkin
- se.sics.cooja.plugins.skins.GridVisualizerSkin
- se.sics.cooja.plugins.skins.TrafficVisualizerSkin
- se.sics.cooja.plugins.skins.UDGMVisualizerSkin
- se.sics.cooja.plugins.skins.MoteTypeVisualizerSkin
+ org.contikios.cooja.plugins.skins.IDVisualizerSkin
+ org.contikios.cooja.plugins.skins.GridVisualizerSkin
+ org.contikios.cooja.plugins.skins.TrafficVisualizerSkin
+ org.contikios.cooja.plugins.skins.UDGMVisualizerSkin
+ org.contikios.cooja.plugins.skins.MoteTypeVisualizerSkin
2.388440494916608 0.0 0.0 2.388440494916608 109.06925371156906 149.10378026149033
400
@@ -323,7 +323,7 @@
1
- se.sics.cooja.plugins.LogListener
+ org.contikios.cooja.plugins.LogListener
@@ -336,7 +336,7 @@
160
- se.sics.cooja.plugins.Notes
+ org.contikios.cooja.plugins.Notes
Enter notes here
true
@@ -348,7 +348,7 @@
0
- se.sics.cooja.plugins.ScriptRunner
+ org.contikios.cooja.plugins.ScriptRunner