diff --git a/examples/antelope/netdb/netdb.csc b/examples/antelope/netdb/netdb.csc
index efbd5ccc2..1bd5868d2 100755
--- a/examples/antelope/netdb/netdb.csc
+++ b/examples/antelope/netdb/netdb.csc
@@ -37,7 +37,7 @@
org.contikios.cooja.mspmote.interfaces.SkyButton
org.contikios.cooja.mspmote.interfaces.SkyFlash
org.contikios.cooja.mspmote.interfaces.SkyCoffeeFilesystem
- org.contikios.cooja.mspmote.interfaces.SkyByteRadio
+ org.contikios.cooja.mspmote.interfaces.Msp802154Radio
org.contikios.cooja.mspmote.interfaces.MspSerial
org.contikios.cooja.mspmote.interfaces.SkyLED
org.contikios.cooja.mspmote.interfaces.MspDebugOutput
@@ -60,7 +60,7 @@
org.contikios.cooja.mspmote.interfaces.SkyButton
org.contikios.cooja.mspmote.interfaces.SkyFlash
org.contikios.cooja.mspmote.interfaces.SkyCoffeeFilesystem
- org.contikios.cooja.mspmote.interfaces.SkyByteRadio
+ org.contikios.cooja.mspmote.interfaces.Msp802154Radio
org.contikios.cooja.mspmote.interfaces.MspSerial
org.contikios.cooja.mspmote.interfaces.SkyLED
org.contikios.cooja.mspmote.interfaces.MspDebugOutput
diff --git a/examples/collect/example-collect-view.csc b/examples/collect/example-collect-view.csc
index c32a73f51..53c917e28 100644
--- a/examples/collect/example-collect-view.csc
+++ b/examples/collect/example-collect-view.csc
@@ -37,7 +37,7 @@
org.contikios.cooja.mspmote.interfaces.SkyButton
org.contikios.cooja.mspmote.interfaces.SkyFlash
org.contikios.cooja.mspmote.interfaces.SkyCoffeeFilesystem
- org.contikios.cooja.mspmote.interfaces.SkyByteRadio
+ org.contikios.cooja.mspmote.interfaces.Msp802154Radio
org.contikios.cooja.mspmote.interfaces.MspSerial
org.contikios.cooja.mspmote.interfaces.SkyLED
org.contikios.cooja.mspmote.interfaces.MspDebugOutput
diff --git a/examples/hello-world/hello-world-example.csc b/examples/hello-world/hello-world-example.csc
index d937a468b..9d4b92395 100644
--- a/examples/hello-world/hello-world-example.csc
+++ b/examples/hello-world/hello-world-example.csc
@@ -40,7 +40,7 @@
org.contikios.cooja.mspmote.interfaces.SkyButton
org.contikios.cooja.mspmote.interfaces.SkyFlash
org.contikios.cooja.mspmote.interfaces.SkyCoffeeFilesystem
- org.contikios.cooja.mspmote.interfaces.SkyByteRadio
+ org.contikios.cooja.mspmote.interfaces.Msp802154Radio
org.contikios.cooja.mspmote.interfaces.MspSerial
org.contikios.cooja.mspmote.interfaces.SkyLED
org.contikios.cooja.mspmote.interfaces.MspDebugOutput
diff --git a/examples/ipv6/rpl-collect/collect-tree-dense-noloss.csc b/examples/ipv6/rpl-collect/collect-tree-dense-noloss.csc
index 0d33f1a40..31a6bedab 100644
--- a/examples/ipv6/rpl-collect/collect-tree-dense-noloss.csc
+++ b/examples/ipv6/rpl-collect/collect-tree-dense-noloss.csc
@@ -37,7 +37,7 @@
org.contikios.cooja.mspmote.interfaces.SkyButton
org.contikios.cooja.mspmote.interfaces.SkyFlash
org.contikios.cooja.mspmote.interfaces.SkyCoffeeFilesystem
- org.contikios.cooja.mspmote.interfaces.SkyByteRadio
+ org.contikios.cooja.mspmote.interfaces.Msp802154Radio
org.contikios.cooja.mspmote.interfaces.MspSerial
org.contikios.cooja.mspmote.interfaces.SkyLED
org.contikios.cooja.mspmote.interfaces.MspDebugOutput
@@ -60,7 +60,7 @@
org.contikios.cooja.mspmote.interfaces.SkyButton
org.contikios.cooja.mspmote.interfaces.SkyFlash
org.contikios.cooja.mspmote.interfaces.SkyCoffeeFilesystem
- org.contikios.cooja.mspmote.interfaces.SkyByteRadio
+ org.contikios.cooja.mspmote.interfaces.Msp802154Radio
org.contikios.cooja.mspmote.interfaces.MspSerial
org.contikios.cooja.mspmote.interfaces.SkyLED
org.contikios.cooja.mspmote.interfaces.MspDebugOutput
diff --git a/examples/ipv6/rpl-collect/collect-tree-sparse-lossy.csc b/examples/ipv6/rpl-collect/collect-tree-sparse-lossy.csc
index a7c056c98..941d596e9 100644
--- a/examples/ipv6/rpl-collect/collect-tree-sparse-lossy.csc
+++ b/examples/ipv6/rpl-collect/collect-tree-sparse-lossy.csc
@@ -37,7 +37,7 @@
org.contikios.cooja.mspmote.interfaces.SkyButton
org.contikios.cooja.mspmote.interfaces.SkyFlash
org.contikios.cooja.mspmote.interfaces.SkyCoffeeFilesystem
- org.contikios.cooja.mspmote.interfaces.SkyByteRadio
+ org.contikios.cooja.mspmote.interfaces.Msp802154Radio
org.contikios.cooja.mspmote.interfaces.MspSerial
org.contikios.cooja.mspmote.interfaces.SkyLED
org.contikios.cooja.mspmote.interfaces.MspDebugOutput
@@ -60,7 +60,7 @@
org.contikios.cooja.mspmote.interfaces.SkyButton
org.contikios.cooja.mspmote.interfaces.SkyFlash
org.contikios.cooja.mspmote.interfaces.SkyCoffeeFilesystem
- org.contikios.cooja.mspmote.interfaces.SkyByteRadio
+ org.contikios.cooja.mspmote.interfaces.Msp802154Radio
org.contikios.cooja.mspmote.interfaces.MspSerial
org.contikios.cooja.mspmote.interfaces.SkyLED
org.contikios.cooja.mspmote.interfaces.MspDebugOutput
diff --git a/examples/ipv6/rpl-udp/rpl-udp-powertrace.csc b/examples/ipv6/rpl-udp/rpl-udp-powertrace.csc
index e85b17393..b10432ab1 100644
--- a/examples/ipv6/rpl-udp/rpl-udp-powertrace.csc
+++ b/examples/ipv6/rpl-udp/rpl-udp-powertrace.csc
@@ -36,7 +36,7 @@
org.contikios.cooja.mspmote.interfaces.SkyButton
org.contikios.cooja.mspmote.interfaces.SkyFlash
org.contikios.cooja.mspmote.interfaces.SkyCoffeeFilesystem
- org.contikios.cooja.mspmote.interfaces.SkyByteRadio
+ org.contikios.cooja.mspmote.interfaces.Msp802154Radio
org.contikios.cooja.mspmote.interfaces.MspSerial
org.contikios.cooja.mspmote.interfaces.SkyLED
org.contikios.cooja.mspmote.interfaces.MspDebugOutput
@@ -59,7 +59,7 @@
org.contikios.cooja.mspmote.interfaces.SkyButton
org.contikios.cooja.mspmote.interfaces.SkyFlash
org.contikios.cooja.mspmote.interfaces.SkyCoffeeFilesystem
- org.contikios.cooja.mspmote.interfaces.SkyByteRadio
+ org.contikios.cooja.mspmote.interfaces.Msp802154Radio
org.contikios.cooja.mspmote.interfaces.MspSerial
org.contikios.cooja.mspmote.interfaces.SkyLED
org.contikios.cooja.mspmote.interfaces.MspDebugOutput
diff --git a/examples/ipv6/rpl-udp/rpl-udp.csc b/examples/ipv6/rpl-udp/rpl-udp.csc
index 5ee97f4d4..7801d0f85 100644
--- a/examples/ipv6/rpl-udp/rpl-udp.csc
+++ b/examples/ipv6/rpl-udp/rpl-udp.csc
@@ -36,7 +36,7 @@
org.contikios.cooja.mspmote.interfaces.SkyButton
org.contikios.cooja.mspmote.interfaces.SkyFlash
org.contikios.cooja.mspmote.interfaces.SkyCoffeeFilesystem
- org.contikios.cooja.mspmote.interfaces.SkyByteRadio
+ org.contikios.cooja.mspmote.interfaces.Msp802154Radio
org.contikios.cooja.mspmote.interfaces.MspSerial
org.contikios.cooja.mspmote.interfaces.SkyLED
org.contikios.cooja.mspmote.interfaces.MspDebugOutput
@@ -59,7 +59,7 @@
org.contikios.cooja.mspmote.interfaces.SkyButton
org.contikios.cooja.mspmote.interfaces.SkyFlash
org.contikios.cooja.mspmote.interfaces.SkyCoffeeFilesystem
- org.contikios.cooja.mspmote.interfaces.SkyByteRadio
+ org.contikios.cooja.mspmote.interfaces.Msp802154Radio
org.contikios.cooja.mspmote.interfaces.MspSerial
org.contikios.cooja.mspmote.interfaces.SkyLED
org.contikios.cooja.mspmote.interfaces.MspDebugOutput
diff --git a/examples/ipv6/simple-udp-rpl/broadcast-example.csc b/examples/ipv6/simple-udp-rpl/broadcast-example.csc
index 042ea0eb8..0e1fe08ba 100644
--- a/examples/ipv6/simple-udp-rpl/broadcast-example.csc
+++ b/examples/ipv6/simple-udp-rpl/broadcast-example.csc
@@ -40,7 +40,7 @@
org.contikios.cooja.mspmote.interfaces.SkyButton
org.contikios.cooja.mspmote.interfaces.SkyFlash
org.contikios.cooja.mspmote.interfaces.SkyCoffeeFilesystem
- org.contikios.cooja.mspmote.interfaces.SkyByteRadio
+ org.contikios.cooja.mspmote.interfaces.Msp802154Radio
org.contikios.cooja.mspmote.interfaces.MspSerial
org.contikios.cooja.mspmote.interfaces.SkyLED
org.contikios.cooja.mspmote.interfaces.MspDebugOutput
diff --git a/examples/ipv6/simple-udp-rpl/unicast-example.csc b/examples/ipv6/simple-udp-rpl/unicast-example.csc
index 08de63603..84a7ad65d 100644
--- a/examples/ipv6/simple-udp-rpl/unicast-example.csc
+++ b/examples/ipv6/simple-udp-rpl/unicast-example.csc
@@ -40,7 +40,7 @@
org.contikios.cooja.mspmote.interfaces.SkyButton
org.contikios.cooja.mspmote.interfaces.SkyFlash
org.contikios.cooja.mspmote.interfaces.SkyCoffeeFilesystem
- org.contikios.cooja.mspmote.interfaces.SkyByteRadio
+ org.contikios.cooja.mspmote.interfaces.Msp802154Radio
org.contikios.cooja.mspmote.interfaces.MspSerial
org.contikios.cooja.mspmote.interfaces.SkyLED
org.contikios.cooja.mspmote.interfaces.MspDebugOutput
@@ -63,7 +63,7 @@
org.contikios.cooja.mspmote.interfaces.SkyButton
org.contikios.cooja.mspmote.interfaces.SkyFlash
org.contikios.cooja.mspmote.interfaces.SkyCoffeeFilesystem
- org.contikios.cooja.mspmote.interfaces.SkyByteRadio
+ org.contikios.cooja.mspmote.interfaces.Msp802154Radio
org.contikios.cooja.mspmote.interfaces.MspSerial
org.contikios.cooja.mspmote.interfaces.SkyLED
org.contikios.cooja.mspmote.interfaces.MspDebugOutput
diff --git a/examples/ipv6/sky-websense/example-sky-websense.csc b/examples/ipv6/sky-websense/example-sky-websense.csc
index 53696c5f2..b83ec2943 100644
--- a/examples/ipv6/sky-websense/example-sky-websense.csc
+++ b/examples/ipv6/sky-websense/example-sky-websense.csc
@@ -36,7 +36,7 @@
org.contikios.cooja.mspmote.interfaces.SkyButton
org.contikios.cooja.mspmote.interfaces.SkyFlash
org.contikios.cooja.mspmote.interfaces.SkyCoffeeFilesystem
- org.contikios.cooja.mspmote.interfaces.SkyByteRadio
+ org.contikios.cooja.mspmote.interfaces.Msp802154Radio
org.contikios.cooja.mspmote.interfaces.MspSerial
org.contikios.cooja.mspmote.interfaces.SkyLED
org.contikios.cooja.mspmote.interfaces.MspDebugOutput
@@ -59,7 +59,7 @@
org.contikios.cooja.mspmote.interfaces.SkyButton
org.contikios.cooja.mspmote.interfaces.SkyFlash
org.contikios.cooja.mspmote.interfaces.SkyCoffeeFilesystem
- org.contikios.cooja.mspmote.interfaces.SkyByteRadio
+ org.contikios.cooja.mspmote.interfaces.Msp802154Radio
org.contikios.cooja.mspmote.interfaces.MspSerial
org.contikios.cooja.mspmote.interfaces.SkyLED
org.contikios.cooja.mspmote.interfaces.MspDebugOutput
diff --git a/examples/netperf/netperf-sky.csc b/examples/netperf/netperf-sky.csc
index 4f5fe755c..6f2083e98 100644
--- a/examples/netperf/netperf-sky.csc
+++ b/examples/netperf/netperf-sky.csc
@@ -35,7 +35,7 @@
org.contikios.cooja.mspmote.interfaces.SkyButton
org.contikios.cooja.mspmote.interfaces.SkyFlash
org.contikios.cooja.mspmote.interfaces.SkyCoffeeFilesystem
- org.contikios.cooja.mspmote.interfaces.SkyByteRadio
+ org.contikios.cooja.mspmote.interfaces.Msp802154Radio
org.contikios.cooja.mspmote.interfaces.SkySerial
org.contikios.cooja.mspmote.interfaces.SkyLED
diff --git a/examples/rest-example/coap-client-server-example.csc b/examples/rest-example/coap-client-server-example.csc
index 72a77ac27..bee90493b 100644
--- a/examples/rest-example/coap-client-server-example.csc
+++ b/examples/rest-example/coap-client-server-example.csc
@@ -36,7 +36,7 @@
org.contikios.cooja.mspmote.interfaces.SkyButton
org.contikios.cooja.mspmote.interfaces.SkyFlash
org.contikios.cooja.mspmote.interfaces.SkyCoffeeFilesystem
- org.contikios.cooja.mspmote.interfaces.SkyByteRadio
+ org.contikios.cooja.mspmote.interfaces.Msp802154Radio
org.contikios.cooja.mspmote.interfaces.MspSerial
org.contikios.cooja.mspmote.interfaces.SkyLED
org.contikios.cooja.mspmote.interfaces.MspDebugOutput
@@ -59,7 +59,7 @@
org.contikios.cooja.mspmote.interfaces.SkyButton
org.contikios.cooja.mspmote.interfaces.SkyFlash
org.contikios.cooja.mspmote.interfaces.SkyCoffeeFilesystem
- org.contikios.cooja.mspmote.interfaces.SkyByteRadio
+ org.contikios.cooja.mspmote.interfaces.Msp802154Radio
org.contikios.cooja.mspmote.interfaces.MspSerial
org.contikios.cooja.mspmote.interfaces.SkyLED
org.contikios.cooja.mspmote.interfaces.MspDebugOutput
diff --git a/examples/rest-example/rest-server-example.csc b/examples/rest-example/rest-server-example.csc
index 31b45e4ef..3b598c66a 100644
--- a/examples/rest-example/rest-server-example.csc
+++ b/examples/rest-example/rest-server-example.csc
@@ -36,7 +36,7 @@
org.contikios.cooja.mspmote.interfaces.SkyButton
org.contikios.cooja.mspmote.interfaces.SkyFlash
org.contikios.cooja.mspmote.interfaces.SkyCoffeeFilesystem
- org.contikios.cooja.mspmote.interfaces.SkyByteRadio
+ org.contikios.cooja.mspmote.interfaces.Msp802154Radio
org.contikios.cooja.mspmote.interfaces.MspSerial
org.contikios.cooja.mspmote.interfaces.SkyLED
org.contikios.cooja.mspmote.interfaces.MspDebugOutput
@@ -59,7 +59,7 @@
org.contikios.cooja.mspmote.interfaces.SkyButton
org.contikios.cooja.mspmote.interfaces.SkyFlash
org.contikios.cooja.mspmote.interfaces.SkyCoffeeFilesystem
- org.contikios.cooja.mspmote.interfaces.SkyByteRadio
+ org.contikios.cooja.mspmote.interfaces.Msp802154Radio
org.contikios.cooja.mspmote.interfaces.MspSerial
org.contikios.cooja.mspmote.interfaces.SkyLED
org.contikios.cooja.mspmote.interfaces.MspDebugOutput
diff --git a/examples/rime/example-broadcast.csc b/examples/rime/example-broadcast.csc
index 1aaf8f52d..b7521721a 100644
--- a/examples/rime/example-broadcast.csc
+++ b/examples/rime/example-broadcast.csc
@@ -40,7 +40,7 @@
org.contikios.cooja.mspmote.interfaces.SkyButton
org.contikios.cooja.mspmote.interfaces.SkyFlash
org.contikios.cooja.mspmote.interfaces.SkyCoffeeFilesystem
- org.contikios.cooja.mspmote.interfaces.SkyByteRadio
+ org.contikios.cooja.mspmote.interfaces.Msp802154Radio
org.contikios.cooja.mspmote.interfaces.MspSerial
org.contikios.cooja.mspmote.interfaces.SkyLED
org.contikios.cooja.mspmote.interfaces.MspDebugOutput
diff --git a/examples/rime/example-collect.csc b/examples/rime/example-collect.csc
index 5d7e6a85a..b5ac57019 100644
--- a/examples/rime/example-collect.csc
+++ b/examples/rime/example-collect.csc
@@ -40,7 +40,7 @@
org.contikios.cooja.mspmote.interfaces.SkyButton
org.contikios.cooja.mspmote.interfaces.SkyFlash
org.contikios.cooja.mspmote.interfaces.SkyCoffeeFilesystem
- org.contikios.cooja.mspmote.interfaces.SkyByteRadio
+ org.contikios.cooja.mspmote.interfaces.Msp802154Radio
org.contikios.cooja.mspmote.interfaces.MspSerial
org.contikios.cooja.mspmote.interfaces.SkyLED
org.contikios.cooja.mspmote.interfaces.MspDebugOutput
diff --git a/examples/trickle-library/trickle-library.csc b/examples/trickle-library/trickle-library.csc
index 2df0dddab..1628d38a6 100644
--- a/examples/trickle-library/trickle-library.csc
+++ b/examples/trickle-library/trickle-library.csc
@@ -38,7 +38,7 @@
org.contikios.cooja.mspmote.interfaces.SkyButton
org.contikios.cooja.mspmote.interfaces.SkyFlash
org.contikios.cooja.mspmote.interfaces.SkyCoffeeFilesystem
- org.contikios.cooja.mspmote.interfaces.SkyByteRadio
+ org.contikios.cooja.mspmote.interfaces.Msp802154Radio
org.contikios.cooja.mspmote.interfaces.MspSerial
org.contikios.cooja.mspmote.interfaces.SkyLED
org.contikios.cooja.mspmote.interfaces.MspDebugOutput
diff --git a/examples/udp-stream/udp-stream.csc b/examples/udp-stream/udp-stream.csc
index 0908440f5..01c949754 100644
--- a/examples/udp-stream/udp-stream.csc
+++ b/examples/udp-stream/udp-stream.csc
@@ -35,7 +35,7 @@
org.contikios.cooja.mspmote.interfaces.SkyButton
org.contikios.cooja.mspmote.interfaces.SkyFlash
org.contikios.cooja.mspmote.interfaces.SkyCoffeeFilesystem
- org.contikios.cooja.mspmote.interfaces.SkyByteRadio
+ org.contikios.cooja.mspmote.interfaces.Msp802154Radio
org.contikios.cooja.mspmote.interfaces.MspSerial
org.contikios.cooja.mspmote.interfaces.SkyLED
org.contikios.cooja.mspmote.interfaces.MspDebugOutput
diff --git a/examples/z1/ipv6/z1-websense/example-sky-websense.csc b/examples/z1/ipv6/z1-websense/example-sky-websense.csc
index 53696c5f2..b83ec2943 100644
--- a/examples/z1/ipv6/z1-websense/example-sky-websense.csc
+++ b/examples/z1/ipv6/z1-websense/example-sky-websense.csc
@@ -36,7 +36,7 @@
org.contikios.cooja.mspmote.interfaces.SkyButton
org.contikios.cooja.mspmote.interfaces.SkyFlash
org.contikios.cooja.mspmote.interfaces.SkyCoffeeFilesystem
- org.contikios.cooja.mspmote.interfaces.SkyByteRadio
+ org.contikios.cooja.mspmote.interfaces.Msp802154Radio
org.contikios.cooja.mspmote.interfaces.MspSerial
org.contikios.cooja.mspmote.interfaces.SkyLED
org.contikios.cooja.mspmote.interfaces.MspDebugOutput
@@ -59,7 +59,7 @@
org.contikios.cooja.mspmote.interfaces.SkyButton
org.contikios.cooja.mspmote.interfaces.SkyFlash
org.contikios.cooja.mspmote.interfaces.SkyCoffeeFilesystem
- org.contikios.cooja.mspmote.interfaces.SkyByteRadio
+ org.contikios.cooja.mspmote.interfaces.Msp802154Radio
org.contikios.cooja.mspmote.interfaces.MspSerial
org.contikios.cooja.mspmote.interfaces.SkyLED
org.contikios.cooja.mspmote.interfaces.MspDebugOutput
diff --git a/regression-tests/03-base/02-sky-coffee.csc b/regression-tests/03-base/02-sky-coffee.csc
index 0fbd86bd6..1f39be10f 100644
--- a/regression-tests/03-base/02-sky-coffee.csc
+++ b/regression-tests/03-base/02-sky-coffee.csc
@@ -35,7 +35,7 @@ make test-coffee.sky TARGET=sky
org.contikios.cooja.mspmote.interfaces.MspMoteID
org.contikios.cooja.mspmote.interfaces.SkyButton
org.contikios.cooja.mspmote.interfaces.SkyFlash
- org.contikios.cooja.mspmote.interfaces.SkyByteRadio
+ org.contikios.cooja.mspmote.interfaces.Msp802154Radio
org.contikios.cooja.mspmote.interfaces.MspSerial
org.contikios.cooja.mspmote.interfaces.SkyLED
diff --git a/regression-tests/03-base/x03-crosslevel.csc b/regression-tests/03-base/x03-crosslevel.csc
index b1753fa2b..f8ef61a48 100644
--- a/regression-tests/03-base/x03-crosslevel.csc
+++ b/regression-tests/03-base/x03-crosslevel.csc
@@ -30,7 +30,7 @@ make example-abc.sky TARGET=sky DEFINES=NETSTACK_MAC=nullmac_driver,NETSTACK_RDC
org.contikios.cooja.mspmote.interfaces.MspMoteID
org.contikios.cooja.mspmote.interfaces.SkyButton
org.contikios.cooja.mspmote.interfaces.SkyFlash
- org.contikios.cooja.mspmote.interfaces.SkyByteRadio
+ org.contikios.cooja.mspmote.interfaces.Msp802154Radio
org.contikios.cooja.mspmote.interfaces.MspSerial
org.contikios.cooja.mspmote.interfaces.SkyLED
org.contikios.cooja.interfaces.RimeAddress
diff --git a/regression-tests/05-netperf/01-sky-netperf.csc b/regression-tests/05-netperf/01-sky-netperf.csc
index f239ae82d..971655b08 100644
--- a/regression-tests/05-netperf/01-sky-netperf.csc
+++ b/regression-tests/05-netperf/01-sky-netperf.csc
@@ -36,7 +36,7 @@ make netperf-shell.sky TARGET=sky
org.contikios.cooja.mspmote.interfaces.SkyButton
org.contikios.cooja.mspmote.interfaces.SkyFlash
org.contikios.cooja.mspmote.interfaces.SkyCoffeeFilesystem
- org.contikios.cooja.mspmote.interfaces.SkyByteRadio
+ org.contikios.cooja.mspmote.interfaces.Msp802154Radio
org.contikios.cooja.mspmote.interfaces.SkySerial
org.contikios.cooja.mspmote.interfaces.SkyLED
diff --git a/regression-tests/05-netperf/02-sky-netperf-lpp.csc b/regression-tests/05-netperf/02-sky-netperf-lpp.csc
index 8f545123e..93dd2cce1 100644
--- a/regression-tests/05-netperf/02-sky-netperf-lpp.csc
+++ b/regression-tests/05-netperf/02-sky-netperf-lpp.csc
@@ -36,7 +36,7 @@ make DEFINES=NETSTACK_RDC=lpp_driver netperf-shell.sky TARGET=sky
org.contikios.cooja.mspmote.interfaces.SkyButton
org.contikios.cooja.mspmote.interfaces.SkyFlash
org.contikios.cooja.mspmote.interfaces.SkyCoffeeFilesystem
- org.contikios.cooja.mspmote.interfaces.SkyByteRadio
+ org.contikios.cooja.mspmote.interfaces.Msp802154Radio
org.contikios.cooja.mspmote.interfaces.SkySerial
org.contikios.cooja.mspmote.interfaces.SkyLED
diff --git a/regression-tests/05-netperf/03-sky-netperf-cxmac.csc b/regression-tests/05-netperf/03-sky-netperf-cxmac.csc
index 266e0b709..761fe3536 100644
--- a/regression-tests/05-netperf/03-sky-netperf-cxmac.csc
+++ b/regression-tests/05-netperf/03-sky-netperf-cxmac.csc
@@ -36,7 +36,7 @@ make DEFINES=NETSTACK_RDC=cxmac_driver netperf-shell.sky TARGET=sky
org.contikios.cooja.mspmote.interfaces.SkyButton
org.contikios.cooja.mspmote.interfaces.SkyFlash
org.contikios.cooja.mspmote.interfaces.SkyCoffeeFilesystem
- org.contikios.cooja.mspmote.interfaces.SkyByteRadio
+ org.contikios.cooja.mspmote.interfaces.Msp802154Radio
org.contikios.cooja.mspmote.interfaces.SkySerial
org.contikios.cooja.mspmote.interfaces.SkyLED
diff --git a/regression-tests/06-shell/01-sky-shell-compile.csc b/regression-tests/06-shell/01-sky-shell-compile.csc
index a889a8e6e..24712ce1f 100644
--- a/regression-tests/06-shell/01-sky-shell-compile.csc
+++ b/regression-tests/06-shell/01-sky-shell-compile.csc
@@ -34,7 +34,7 @@ make sky-shell.sky TARGET=sky
org.contikios.cooja.mspmote.interfaces.MspMoteID
org.contikios.cooja.mspmote.interfaces.SkyButton
org.contikios.cooja.mspmote.interfaces.SkyFlash
- org.contikios.cooja.mspmote.interfaces.SkyByteRadio
+ org.contikios.cooja.mspmote.interfaces.Msp802154Radio
org.contikios.cooja.mspmote.interfaces.MspSerial
org.contikios.cooja.mspmote.interfaces.SkyLED
diff --git a/regression-tests/06-shell/02-sky-shell-basic-commands.csc b/regression-tests/06-shell/02-sky-shell-basic-commands.csc
index c918aec63..19250e31d 100644
--- a/regression-tests/06-shell/02-sky-shell-basic-commands.csc
+++ b/regression-tests/06-shell/02-sky-shell-basic-commands.csc
@@ -34,7 +34,7 @@ make sky-shell.sky TARGET=sky
org.contikios.cooja.mspmote.interfaces.MspMoteID
org.contikios.cooja.mspmote.interfaces.SkyButton
org.contikios.cooja.mspmote.interfaces.SkyFlash
- org.contikios.cooja.mspmote.interfaces.SkyByteRadio
+ org.contikios.cooja.mspmote.interfaces.Msp802154Radio
org.contikios.cooja.mspmote.interfaces.MspSerial
org.contikios.cooja.mspmote.interfaces.SkyLED
org.contikios.cooja.interfaces.RimeAddress
diff --git a/regression-tests/06-shell/03-sky-shell-sendcmd.csc b/regression-tests/06-shell/03-sky-shell-sendcmd.csc
index 605c6cdc3..03ab84dde 100644
--- a/regression-tests/06-shell/03-sky-shell-sendcmd.csc
+++ b/regression-tests/06-shell/03-sky-shell-sendcmd.csc
@@ -33,7 +33,7 @@ make sky-shell.sky TARGET=sky
org.contikios.cooja.mspmote.interfaces.MspMoteID
org.contikios.cooja.mspmote.interfaces.SkyButton
org.contikios.cooja.mspmote.interfaces.SkyFlash
- org.contikios.cooja.mspmote.interfaces.SkyByteRadio
+ org.contikios.cooja.mspmote.interfaces.Msp802154Radio
org.contikios.cooja.mspmote.interfaces.MspSerial
org.contikios.cooja.mspmote.interfaces.SkyLED
org.contikios.cooja.interfaces.RimeAddress
diff --git a/regression-tests/06-shell/04-sky-shell-download.csc.fails b/regression-tests/06-shell/04-sky-shell-download.csc.fails
index bf055ad62..adeb111a2 100644
--- a/regression-tests/06-shell/04-sky-shell-download.csc.fails
+++ b/regression-tests/06-shell/04-sky-shell-download.csc.fails
@@ -32,7 +32,7 @@
org.contikios.cooja.mspmote.interfaces.SkyButton
org.contikios.cooja.mspmote.interfaces.SkyFlash
org.contikios.cooja.mspmote.interfaces.SkyCoffeeFilesystem
- org.contikios.cooja.mspmote.interfaces.SkyByteRadio
+ org.contikios.cooja.mspmote.interfaces.Msp802154Radio
org.contikios.cooja.mspmote.interfaces.MspSerial
org.contikios.cooja.mspmote.interfaces.SkyLED
org.contikios.cooja.mspmote.interfaces.MspDebugOutput
diff --git a/regression-tests/07-elfloader/01-sky-shell-exec-serial.csc b/regression-tests/07-elfloader/01-sky-shell-exec-serial.csc
index d10c4314f..6d010c6c5 100644
--- a/regression-tests/07-elfloader/01-sky-shell-exec-serial.csc
+++ b/regression-tests/07-elfloader/01-sky-shell-exec-serial.csc
@@ -43,7 +43,7 @@ make hello-world.ce TARGET=sky SMALL=0
org.contikios.cooja.mspmote.interfaces.SkyButton
org.contikios.cooja.mspmote.interfaces.SkyFlash
org.contikios.cooja.mspmote.interfaces.SkyCoffeeFilesystem
- org.contikios.cooja.mspmote.interfaces.SkyByteRadio
+ org.contikios.cooja.mspmote.interfaces.Msp802154Radio
org.contikios.cooja.mspmote.interfaces.MspSerial
org.contikios.cooja.mspmote.interfaces.SkyLED
org.contikios.cooja.mspmote.interfaces.MspDebugOutput
diff --git a/regression-tests/10-ipv4/x02-ip-sky-telnet-ping.csc b/regression-tests/10-ipv4/x02-ip-sky-telnet-ping.csc
index b2a10bdb4..287acbe12 100644
--- a/regression-tests/10-ipv4/x02-ip-sky-telnet-ping.csc
+++ b/regression-tests/10-ipv4/x02-ip-sky-telnet-ping.csc
@@ -32,7 +32,7 @@
org.contikios.cooja.mspmote.interfaces.SkyButton
org.contikios.cooja.mspmote.interfaces.SkyFlash
org.contikios.cooja.mspmote.interfaces.SkyCoffeeFilesystem
- org.contikios.cooja.mspmote.interfaces.SkyByteRadio
+ org.contikios.cooja.mspmote.interfaces.Msp802154Radio
org.contikios.cooja.mspmote.interfaces.MspSerial
org.contikios.cooja.mspmote.interfaces.SkyLED
org.contikios.cooja.mspmote.interfaces.MspDebugOutput
diff --git a/regression-tests/10-ipv4/x03-ip-sky-webserver-wget.csc b/regression-tests/10-ipv4/x03-ip-sky-webserver-wget.csc
index 6f5207ea8..7c2fa2ee2 100644
--- a/regression-tests/10-ipv4/x03-ip-sky-webserver-wget.csc
+++ b/regression-tests/10-ipv4/x03-ip-sky-webserver-wget.csc
@@ -34,7 +34,7 @@ make sky-shell-webserver.sky TARGET=sky DEFINES=NETSTACK_MAC=nullmac_driver,NETS
org.contikios.cooja.mspmote.interfaces.MspMoteID
org.contikios.cooja.mspmote.interfaces.SkyButton
org.contikios.cooja.mspmote.interfaces.SkyFlash
- org.contikios.cooja.mspmote.interfaces.SkyByteRadio
+ org.contikios.cooja.mspmote.interfaces.Msp802154Radio
org.contikios.cooja.mspmote.interfaces.MspSerial
org.contikios.cooja.mspmote.interfaces.SkyLED
diff --git a/regression-tests/11-ipv6/02-sky-ipv6-udp.csc.flaky b/regression-tests/11-ipv6/02-sky-ipv6-udp.csc.flaky
index 9011f0827..7eb321a02 100644
--- a/regression-tests/11-ipv6/02-sky-ipv6-udp.csc.flaky
+++ b/regression-tests/11-ipv6/02-sky-ipv6-udp.csc.flaky
@@ -33,7 +33,7 @@ make udp-client.sky TARGET=sky DEFINES=UDP_CONNECTION_ADDR=fe80::212:7402:2:202<
org.contikios.cooja.mspmote.interfaces.MspMoteID
org.contikios.cooja.mspmote.interfaces.SkyButton
org.contikios.cooja.mspmote.interfaces.SkyFlash
- org.contikios.cooja.mspmote.interfaces.SkyByteRadio
+ org.contikios.cooja.mspmote.interfaces.Msp802154Radio
org.contikios.cooja.mspmote.interfaces.MspSerial
org.contikios.cooja.mspmote.interfaces.SkyLED
@@ -51,7 +51,7 @@ make udp-client.sky TARGET=sky DEFINES=UDP_CONNECTION_ADDR=fe80::212:7402:2:202<
org.contikios.cooja.mspmote.interfaces.MspMoteID
org.contikios.cooja.mspmote.interfaces.SkyButton
org.contikios.cooja.mspmote.interfaces.SkyFlash
- org.contikios.cooja.mspmote.interfaces.SkyByteRadio
+ org.contikios.cooja.mspmote.interfaces.Msp802154Radio
org.contikios.cooja.mspmote.interfaces.MspSerial
org.contikios.cooja.mspmote.interfaces.SkyLED
diff --git a/regression-tests/13-ipv6-apps/x02-sky-coap.csc b/regression-tests/13-ipv6-apps/x02-sky-coap.csc
index d39a604c0..870af1e78 100644
--- a/regression-tests/13-ipv6-apps/x02-sky-coap.csc
+++ b/regression-tests/13-ipv6-apps/x02-sky-coap.csc
@@ -32,7 +32,7 @@
org.contikios.cooja.mspmote.interfaces.SkyButton
org.contikios.cooja.mspmote.interfaces.SkyFlash
org.contikios.cooja.mspmote.interfaces.SkyCoffeeFilesystem
- org.contikios.cooja.mspmote.interfaces.SkyByteRadio
+ org.contikios.cooja.mspmote.interfaces.Msp802154Radio
org.contikios.cooja.mspmote.interfaces.MspSerial
org.contikios.cooja.mspmote.interfaces.SkyLED
org.contikios.cooja.mspmote.interfaces.MspDebugOutput
@@ -55,7 +55,7 @@
org.contikios.cooja.mspmote.interfaces.SkyButton
org.contikios.cooja.mspmote.interfaces.SkyFlash
org.contikios.cooja.mspmote.interfaces.SkyCoffeeFilesystem
- org.contikios.cooja.mspmote.interfaces.SkyByteRadio
+ org.contikios.cooja.mspmote.interfaces.Msp802154Radio
org.contikios.cooja.mspmote.interfaces.MspSerial
org.contikios.cooja.mspmote.interfaces.SkyLED
org.contikios.cooja.mspmote.interfaces.MspDebugOutput