Index: tests/concurrency/actors/dynamic.cfa
===================================================================
--- tests/concurrency/actors/dynamic.cfa	(revision b699a613ae1390284b337f98acd284ef976ee500)
+++ tests/concurrency/actors/dynamic.cfa	(revision 41882628bfa69f8a243e4ff726329c75f9ba655a)
@@ -48,6 +48,5 @@
 
 	executor e{ 0, 1, 1, false };
-	start_actor_system( e );
-
+	actor_start( e );
 	sout | "started";
 
@@ -58,6 +57,5 @@
 	*d_actor | *d_msg;
 
-	stop_actor_system();
-
+	actor_stop();
 	sout | "stopped";
 }
Index: tests/concurrency/actors/executor.cfa
===================================================================
--- tests/concurrency/actors/executor.cfa	(revision b699a613ae1390284b337f98acd284ef976ee500)
+++ tests/concurrency/actors/executor.cfa	(revision 41882628bfa69f8a243e4ff726329c75f9ba655a)
@@ -84,19 +84,12 @@
 
 	sout | "starting";
-
-	start_actor_system( e );
-
+	actor_start( e );
 	sout | "started";
-
 	d_actor actors[ Actors ];
-
 	for ( i; Actors ) {
 		actors[i] | shared_msg;
 	} // for
-
 	sout | "stopping";
-
-	stop_actor_system();
-
+	actor_stop();
 	sout | "stopped";
 }
Index: tests/concurrency/actors/inherit.cfa
===================================================================
--- tests/concurrency/actors/inherit.cfa	(revision b699a613ae1390284b337f98acd284ef976ee500)
+++ tests/concurrency/actors/inherit.cfa	(revision 41882628bfa69f8a243e4ff726329c75f9ba655a)
@@ -29,5 +29,5 @@
 	sout | "Start";
 	{
-		start_actor_system();
+		actor_start();
 		D_msg * dm = alloc();
 		(*dm){};
@@ -40,8 +40,8 @@
 		*s | *dm;
 		*s2 | *dm2;
-		stop_actor_system();
+		actor_stop();
 	}
 	{
-		start_actor_system();
+		actor_start();
 		Server s[2];
 		D_msg * dm = alloc();
@@ -51,5 +51,5 @@
 		s[0] | *dm;
 		s[1] | *dm2;
-		stop_actor_system();
+		actor_stop();
 	}
 	sout | "Finished";
Index: tests/concurrency/actors/inline.cfa
===================================================================
--- tests/concurrency/actors/inline.cfa	(revision b699a613ae1390284b337f98acd284ef976ee500)
+++ tests/concurrency/actors/inline.cfa	(revision 41882628bfa69f8a243e4ff726329c75f9ba655a)
@@ -38,13 +38,13 @@
 	processor p;
 	{
-		start_actor_system();								// sets up executor
+		actor_start();								// sets up executor
 		d_actor da;
 		d_msg * dm = alloc();
 		(*dm){ 42, 2423 };
 		da | *dm;
-		stop_actor_system();								// waits until actors finish
+		actor_stop();								// waits until actors finish
 	}
 	{
-		start_actor_system();								// sets up executor
+		actor_start();								// sets up executor
 		d_actor da;
 		d_msg2 dm{ 29079 };
@@ -54,5 +54,5 @@
 		virtual_dtor * v = &dm;
 		da | dm;
-		stop_actor_system();								// waits until actors finish
+		actor_stop();								// waits until actors finish
 	}
 }
Index: tests/concurrency/actors/matrixMultiply.cfa
===================================================================
--- tests/concurrency/actors/matrixMultiply.cfa	(revision b699a613ae1390284b337f98acd284ef976ee500)
+++ tests/concurrency/actors/matrixMultiply.cfa	(revision 41882628bfa69f8a243e4ff726329c75f9ba655a)
@@ -88,11 +88,7 @@
 
 	sout | "starting";
-
-	start_actor_system( e );
-
+	actor_start( e );
 	sout | "started";
-
 	derived_msg messages[xr];
-
 	derived_actor actors[xr];
 
@@ -100,5 +96,4 @@
 		messages[r]{ Z[r], X[r], Y };
 	} // for
-
 	for ( r; xr ) {
 		actors[r] | messages[r];
@@ -106,7 +101,5 @@
 
 	sout | "stopping";
-
-	stop_actor_system();
-
+	actor_stop();
 	sout | "stopped";
 
Index: tests/concurrency/actors/pingpong.cfa
===================================================================
--- tests/concurrency/actors/pingpong.cfa	(revision b699a613ae1390284b337f98acd284ef976ee500)
+++ tests/concurrency/actors/pingpong.cfa	(revision 41882628bfa69f8a243e4ff726329c75f9ba655a)
@@ -47,5 +47,5 @@
 	processor p[Processors - 1];
 
-	start_actor_system( Processors ); // test passing number of processors
+	actor_start( Processors ); // test passing number of processors
 	ping pi_actor;
 	pong po_actor;
@@ -54,5 +54,5 @@
 	p_msg m;
 	pi_actor | m;
-	stop_actor_system();
+	actor_stop();
 
 	sout | "end";
Index: tests/concurrency/actors/poison.cfa
===================================================================
--- tests/concurrency/actors/poison.cfa	(revision b699a613ae1390284b337f98acd284ef976ee500)
+++ tests/concurrency/actors/poison.cfa	(revision 41882628bfa69f8a243e4ff726329c75f9ba655a)
@@ -15,15 +15,15 @@
 	sout | "Finished";
 	{
-		start_actor_system();
+		actor_start();
 		Server s[10];
 		for ( i; 10 ) {
 			s[i] | finished_msg;
 		}
-		stop_actor_system();
+		actor_stop();
 	}
 
 	sout | "Delete";
 	{
-		start_actor_system();
+		actor_start();
 		for ( i; 10 ) {
 			Server * s = alloc();
@@ -31,14 +31,14 @@
 			(*s) | delete_msg;
 		}
-		stop_actor_system();
+		actor_stop();
 	}
 
 	sout | "Destroy";
 	{
-		start_actor_system();
+		actor_start();
 		Server s[10];
 		for ( i; 10 )
 			s[i] | destroy_msg;
-		stop_actor_system();
+		actor_stop();
 		for ( i; 10 )
 			if (s[i].val != 777)
Index: tests/concurrency/actors/static.cfa
===================================================================
--- tests/concurrency/actors/static.cfa	(revision b699a613ae1390284b337f98acd284ef976ee500)
+++ tests/concurrency/actors/static.cfa	(revision 41882628bfa69f8a243e4ff726329c75f9ba655a)
@@ -45,16 +45,10 @@
 
 	executor e{ 0, 1, 1, false };
-	start_actor_system( e );
-
+	actor_start( e );
 	sout | "started";
-
 	derived_msg msg;
-
 	derived_actor actor;
-
 	actor | msg;
-
-	stop_actor_system();
-
+	actor_stop();
 	sout | "stopped";
 }
Index: tests/concurrency/actors/types.cfa
===================================================================
--- tests/concurrency/actors/types.cfa	(revision b699a613ae1390284b337f98acd284ef976ee500)
+++ tests/concurrency/actors/types.cfa	(revision 41882628bfa69f8a243e4ff726329c75f9ba655a)
@@ -67,5 +67,5 @@
 
 	sout | "basic test"; 
-	start_actor_system( Processors ); // test passing number of processors
+	actor_start( Processors ); // test passing number of processors
 	derived_actor a;
 	d_msg b, c;
@@ -73,8 +73,8 @@
 	c.num = 2;
 	a | b | c;
-	stop_actor_system();
+	actor_stop();
 
 	sout | "same message and different actors test";
-	start_actor_system(); // let system detect # of processors
+	actor_start(); // let system detect # of processors
 	derived_actor2 d_ac2_0, d_ac2_1;
 	d_msg d_ac2_msg;
@@ -82,5 +82,5 @@
 	d_ac2_0 | d_ac2_msg;
 	d_ac2_1 | d_ac2_msg;
-	stop_actor_system();
+	actor_stop();
 
 	
@@ -88,5 +88,5 @@
 		sout | "same message and different actor types test";
 		executor e{ 0, Processors, Processors == 1 ? 1 : Processors * 4, false };
-		start_actor_system( e ); // pass an explicit executor
+		actor_start( e ); // pass an explicit executor
 		derived_actor2 d_ac2_2;
 		derived_actor3 d_ac3_0;
@@ -95,5 +95,5 @@
 		d_ac3_0 | d_ac23_msg;
 		d_ac2_2 | d_ac23_msg;
-		stop_actor_system();
+		actor_stop();
 	} // RAII to clean up executor
 
@@ -101,5 +101,5 @@
 		sout | "different message types, one actor test";
 		executor e{ 1, Processors, Processors == 1 ? 1 : Processors * 4, true };
-		start_actor_system( Processors );
+		actor_start( Processors );
 		derived_actor3 a3;
 		d_msg b1;
@@ -108,5 +108,5 @@
 		c2.num = 5;
 		a3 | b1 | c2;
-		stop_actor_system();
+		actor_stop();
 	} // RAII to clean up executor
 
@@ -114,5 +114,5 @@
 		sout | "nested inheritance actor test";
 		executor e{ 1, Processors, Processors == 1 ? 1 : Processors * 4, true };
-		start_actor_system( Processors );
+		actor_start( Processors );
 		derived_actor4 a4;
 		d_msg b1;
@@ -121,5 +121,5 @@
 		c2.num = 5;
 		a4 | b1 | c2;
-		stop_actor_system();
+		actor_stop();
 	} // RAII to clean up executor