diff --git a/tools/cooja/contiki_tests/rime_abc.csc b/tools/cooja/contiki_tests/rime_abc.csc
index 5592c7963..40a517a34 100644
--- a/tools/cooja/contiki_tests/rime_abc.csc
+++ b/tools/cooja/contiki_tests/rime_abc.csc
@@ -19,7 +19,7 @@
       <identifier>sky1</identifier>
       <description>Sky Mote Type #1</description>
       <source>../../../examples/rime/example-abc.c</source>
-      <command>make example-abc.firmware TARGET=sky</command>
+      <command>make example-abc.sky TARGET=sky</command>
     </motetype>
     <mote>
       se.sics.cooja.mspmote.SkyMote
diff --git a/tools/cooja/contiki_tests/rime_trickle.csc b/tools/cooja/contiki_tests/rime_trickle.csc
index 9eef89dbb..4bc80808f 100644
--- a/tools/cooja/contiki_tests/rime_trickle.csc
+++ b/tools/cooja/contiki_tests/rime_trickle.csc
@@ -19,7 +19,7 @@
       <identifier>sky1</identifier>
       <description>Sky Mote Type #1</description>
       <source>../../../examples/rime/example-trickle.c</source>
-      <command>make example-trickle.firmware TARGET=sky</command>
+      <command>make example-trickle.sky TARGET=sky</command>
     </motetype>
     <mote>
       se.sics.cooja.mspmote.SkyMote
diff --git a/tools/cooja/contiki_tests/sky_coffee.csc b/tools/cooja/contiki_tests/sky_coffee.csc
index 9f33c55b0..31337d611 100644
--- a/tools/cooja/contiki_tests/sky_coffee.csc
+++ b/tools/cooja/contiki_tests/sky_coffee.csc
@@ -1,40 +1,40 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<simconf>
-  <simulation>
-    <title>test</title>
-    <delaytime>0</delaytime>
-    <ticktime>1</ticktime>
-    <randomseed>123456</randomseed>
-    <nrticklists>1</nrticklists>
-    <motedelay>0</motedelay>
-    <radiomedium>
-      se.sics.cooja.radiomediums.UDGM
-      <transmitting_range>50.0</transmitting_range>
-      <interference_range>100.0</interference_range>
-      <success_ratio_tx>1.0</success_ratio_tx>
-      <success_ratio_rx>1.0</success_ratio_rx>
-    </radiomedium>
-    <motetype>
-      se.sics.cooja.mspmote.SkyMoteType
-      <identifier>sky1</identifier>
-      <description>Sky Mote Type #1</description>
-      <source>../../../examples/sky/test-coffee.c</source>
-      <command>make test-coffee.firmware TARGET=sky</command>
-    </motetype>
-    <mote>
-      se.sics.cooja.mspmote.SkyMote
-      <motetype_identifier>sky1</motetype_identifier>
-      <interface_config>
-        se.sics.cooja.interfaces.Position
-        <x>97.11078411573273</x>
-        <y>56.790978919276014</y>
-        <z>0.0</z>
-      </interface_config>
-      <interface_config>
-        se.sics.cooja.mspmote.interfaces.MspMoteID
-        <id>1</id>
-      </interface_config>
-    </mote>
-  </simulation>
-</simconf>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<simconf>
+  <simulation>
+    <title>test</title>
+    <delaytime>0</delaytime>
+    <ticktime>1</ticktime>
+    <randomseed>123456</randomseed>
+    <nrticklists>1</nrticklists>
+    <motedelay>0</motedelay>
+    <radiomedium>
+      se.sics.cooja.radiomediums.UDGM
+      <transmitting_range>50.0</transmitting_range>
+      <interference_range>100.0</interference_range>
+      <success_ratio_tx>1.0</success_ratio_tx>
+      <success_ratio_rx>1.0</success_ratio_rx>
+    </radiomedium>
+    <motetype>
+      se.sics.cooja.mspmote.SkyMoteType
+      <identifier>sky1</identifier>
+      <description>Sky Mote Type #1</description>
+      <source>../../../examples/sky/test-coffee.c</source>
+      <command>make test-coffee.sky TARGET=sky</command>
+    </motetype>
+    <mote>
+      se.sics.cooja.mspmote.SkyMote
+      <motetype_identifier>sky1</motetype_identifier>
+      <interface_config>
+        se.sics.cooja.interfaces.Position
+        <x>97.11078411573273</x>
+        <y>56.790978919276014</y>
+        <z>0.0</z>
+      </interface_config>
+      <interface_config>
+        se.sics.cooja.mspmote.interfaces.MspMoteID
+        <id>1</id>
+      </interface_config>
+    </mote>
+  </simulation>
+</simconf>
+
diff --git a/tools/cooja/contiki_tests/sky_helloworld.csc b/tools/cooja/contiki_tests/sky_helloworld.csc
index 7029073a8..1a9625f04 100644
--- a/tools/cooja/contiki_tests/sky_helloworld.csc
+++ b/tools/cooja/contiki_tests/sky_helloworld.csc
@@ -19,7 +19,7 @@
       <identifier>sky1</identifier>
       <description>Sky Mote Type #1</description>
       <source>../../../examples/hello-world/hello-world.c</source>
-      <command>make hello-world.firmware TARGET=sky</command>
+      <command>make hello-world.sky TARGET=sky</command>
     </motetype>
     <mote>
       se.sics.cooja.mspmote.SkyMote