diff --git a/src/runtime2/tests/messaging.rs b/src/runtime2/tests/messaging.rs
index fc4a0dd65f241980bcc60e866ee705620648a501..07e2464760f1ad941dc69079be7bfa61e688bddf 100644
--- a/src/runtime2/tests/messaging.rs
+++ b/src/runtime2/tests/messaging.rs
@@ -4,7 +4,7 @@ use super::*;
 #[test]
 fn test_component_communication() {
     let pd = ProtocolDescription::parse(b"
-    primitive sender(out<u32> o, u32 outside_loops, u32 inside_loops) {
+    comp sender(out<u32> o, u32 outside_loops, u32 inside_loops) {
         u32 outside_index = 0;
         while (outside_index < outside_loops) {
             u32 inside_index = 0;
@@ -16,7 +16,7 @@ fn test_component_communication() {
         }
     }
 
-    primitive receiver(in<u32> i, u32 outside_loops, u32 inside_loops) {
+    comp receiver(in<u32> i, u32 outside_loops, u32 inside_loops) {
         u32 outside_index = 0;
         while (outside_index < outside_loops) {
             u32 inside_index = 0;
@@ -29,7 +29,7 @@ fn test_component_communication() {
         }
     }
 
-    composite constructor() {
+    comp constructor() {
         channel o_orom -> i_orom;
         channel o_mrom -> i_mrom;
         channel o_ormm -> i_ormm;
@@ -58,7 +58,7 @@ fn test_component_communication() {
 #[test]
 fn test_send_to_self() {
     compile_and_create_component("
-    primitive insane_in_the_membrane() {
+    comp insane_in_the_membrane() {
         channel a -> b;
         sync {
             put(a, 1);
@@ -72,7 +72,7 @@ fn test_send_to_self() {
 #[test]
 fn test_intermediate_messenger() {
     let pd = ProtocolDescription::parse(b"
-    primitive receiver<T>(in<T> rx, u32 num) {
+    comp receiver<T>(in<T> rx, u32 num) {
         auto index = 0;
         while (index < num) {
             sync { auto v = get(rx); }
@@ -80,7 +80,7 @@ fn test_intermediate_messenger() {
         }
     }
 
-    primitive middleman<T>(in<T> rx, out<T> tx, u32 num) {
+    comp middleman<T>(in<T> rx, out<T> tx, u32 num) {
         auto index = 0;
         while (index < num) {
             sync { put(tx, get(rx)); }
@@ -88,7 +88,7 @@ fn test_intermediate_messenger() {
         }
     }
 
-    primitive sender<T>(out<T> tx, u32 num) {
+    comp sender<T>(out<T> tx, u32 num) {
         auto index = 0;
         while (index < num) {
             sync put(tx, 1337);
@@ -96,7 +96,7 @@ fn test_intermediate_messenger() {
         }
     }
 
-    composite constructor_template<T>() {
+    comp constructor_template<T>() {
         auto num = 0;
         channel<T> tx_a -> rx_a;
         channel tx_b -> rx_b;
@@ -105,7 +105,7 @@ fn test_intermediate_messenger() {
         new receiver(rx_b, 3);
     }
 
-    composite constructor() {
+    comp constructor() {
         new constructor_template<u16>();
         new constructor_template<u32>();
         new constructor_template<u64>();