diff --git a/src/system.c b/src/system.c
index 00c9b47..0ad9d06 100644
--- a/src/system.c
+++ b/src/system.c
@@ -919,6 +919,7 @@ int compute_roleeventmax (const System sys)
 void
 runInstancePrint (const System sys, const int run)
 {
+  termPrint (sys->runs[run].role->nameterm);
   termlistPrint (sys->runs[run].agents);
 }
 
@@ -931,9 +932,9 @@ scenarioPrint (const System sys)
   for (run = 0; run < sys->maxruns; run++)
     {
       runInstancePrint (sys, run);
-      if (run < sys->maxruns - 2)
+      if (run < sys->maxruns - 1)
 	{
-          printf (", ");
+          printf ("\t");
 	}
     }
 }
diff --git a/src/term.h b/src/term.h
index faf5834..8cd64d6 100644
--- a/src/term.h
+++ b/src/term.h
@@ -3,11 +3,8 @@
 
 #include "symbol.h"
 
-#define	GLOBAL	 1
-#define VARIABLE 2
-#define LEAF	 3		// type <= LEAF means it's a leaf, nkay?
-#define	ENCRYPT  4
-#define	TUPLE	 5
+// type <= LEAF means it's a leaf, nkay?
+enum termtypes { GLOBAL, VARIABLE, LEAF, ENCRYPT, TUPLE };
 
 //! The most basic datatype in the modelchecker.
 /**