Index: tests/enum_tests/.expect/position.txt
===================================================================
--- tests/enum_tests/.expect/position.txt	(revision b699a613ae1390284b337f98acd284ef976ee500)
+++ tests/enum_tests/.expect/position.txt	(revision 532c0cdf854a68fe4bfc7de28c87688b31f9c5ed)
@@ -1,5 +1,5 @@
-Compile Time: blue value: blue, position: 2, label: Blue, default return value: blue
-Runtime: fishy value: green, position: 1, label: Green, default return value: green
-Runtime: C2 value: green, position: 1, label: Green, default return value: green
+Enumeration Constant<Blue>:: value: blue, position: 2, label: Blue, default output: Blue
+Runtime Value<fishy>:: value: green, position: 1, label: Green, default output: Green
+Runtime Value<C2>:: value: green, position: 1, label: Green, default output: Green
 ao is red
 ko is green
Index: tests/enum_tests/anonymous.cfa
===================================================================
--- tests/enum_tests/anonymous.cfa	(revision b699a613ae1390284b337f98acd284ef976ee500)
+++ tests/enum_tests/anonymous.cfa	(revision 532c0cdf854a68fe4bfc7de28c87688b31f9c5ed)
@@ -3,5 +3,5 @@
 
 int main() {
-    sout | nthreads;
+    sout | value(nthreads);
 }
 
Index: tests/enum_tests/enumInlineValue.cfa
===================================================================
--- tests/enum_tests/enumInlineValue.cfa	(revision b699a613ae1390284b337f98acd284ef976ee500)
+++ tests/enum_tests/enumInlineValue.cfa	(revision 532c0cdf854a68fe4bfc7de28c87688b31f9c5ed)
@@ -1,4 +1,3 @@
 #include <fstream.hfa>
-#include <enum.hfa>
 
 enum(int) A !{
Index: tests/enum_tests/input.cfa
===================================================================
--- tests/enum_tests/input.cfa	(revision b699a613ae1390284b337f98acd284ef976ee500)
+++ tests/enum_tests/input.cfa	(revision 532c0cdf854a68fe4bfc7de28c87688b31f9c5ed)
@@ -1,4 +1,3 @@
 #include <fstream.hfa>
-#include <enum.hfa>
 
 int main() {
Index: tests/enum_tests/planet.cfa
===================================================================
--- tests/enum_tests/planet.cfa	(revision b699a613ae1390284b337f98acd284ef976ee500)
+++ tests/enum_tests/planet.cfa	(revision 532c0cdf854a68fe4bfc7de28c87688b31f9c5ed)
@@ -1,5 +1,4 @@
 #include <fstream.hfa>
 #include <stdlib.hfa>
-#include <enum.hfa>
 
 struct MR { double mass, radius; };
Index: tests/enum_tests/position.cfa
===================================================================
--- tests/enum_tests/position.cfa	(revision b699a613ae1390284b337f98acd284ef976ee500)
+++ tests/enum_tests/position.cfa	(revision 532c0cdf854a68fe4bfc7de28c87688b31f9c5ed)
@@ -17,7 +17,7 @@
     Colour c2 = fishy;
 
-    sout | "Compile Time: blue value: " | value(Colour.Blue) | ", position: " | posn(Colour.Blue) | ", label: " | label(Colour.Blue) | ", default return value: " | Colour.Blue;
-    sout | "Runtime: fishy value: " | value(fishy) | ", position: " | posn(fishy) | ", label: " | label(fishy) | ", default return value: " | fishy;
-    sout | "Runtime: C2 value: " | value(c2) | ", position: " | posn(c2) | ", label: " | label(c2) | ", default return value: " | c2;
+    sout | "Enumeration Constant<Blue>:: value: " | value(Colour.Blue) | ", position: " | posn(Colour.Blue) | ", label: " | label(Colour.Blue) | ", default output: " | Colour.Blue;
+    sout | "Runtime Value<fishy>:: value: " | value(fishy) | ", position: " | posn(fishy) | ", label: " | label(fishy) | ", default output: " | fishy;
+    sout | "Runtime Value<C2>:: value: " | value(c2) | ", position: " | posn(c2) | ", label: " | label(c2) | ", default output: " | c2;
     Colour.Red;
     char * ao = Colour.Red;
Index: tests/enum_tests/typedIntEnum.cfa
===================================================================
--- tests/enum_tests/typedIntEnum.cfa	(revision b699a613ae1390284b337f98acd284ef976ee500)
+++ tests/enum_tests/typedIntEnum.cfa	(revision 532c0cdf854a68fe4bfc7de28c87688b31f9c5ed)
@@ -12,11 +12,11 @@
 
 int main() {
-    sout | "0=" | zero;
-    sout | "1=" | one;
-    sout | "1000=" | thousand;
-    sout | "1001=" | thousand_one;
-    sout | "2000=" | two_thousand;
-    sout | "2001=" | two_thousand_one;
-    sout | "2002=" | two_thousand_two;
+    sout | "0=" | value(zero);
+    sout | "1=" | value(one);
+    sout | "1000=" | value(thousand);
+    sout | "1001=" | value(thousand_one);
+    sout | "2000=" | value(two_thousand);
+    sout | "2001=" | value(two_thousand_one);
+    sout | "2002=" | value(two_thousand_two);
     return 0;
 }
Index: tests/enum_tests/voidEnum.cfa
===================================================================
--- tests/enum_tests/voidEnum.cfa	(revision b699a613ae1390284b337f98acd284ef976ee500)
+++ tests/enum_tests/voidEnum.cfa	(revision 532c0cdf854a68fe4bfc7de28c87688b31f9c5ed)
@@ -1,4 +1,3 @@
 #include <fstream.hfa>
-#include <enum.hfa>
 
 enum() E { A, B, C };