Index: libcfa/src/enum.cfa
===================================================================
--- libcfa/src/enum.cfa	(revision 525f7ad65aaee3be785c86c188b191a2450ac8cc)
+++ libcfa/src/enum.cfa	(revision 089b39e10a2775643258a72adda3f50aeb1ed600)
@@ -6,17 +6,17 @@
 forall(ostype & | basic_ostream(ostype), E, V| CfaEnum(E, V))
 ostype & ?|?(ostype& os, E e) {
-    return os | type_name(e) | "." | labelE(e);
+    return os | type_name(e) | "." | label(e);
 }
 
 forall(ostype & | basic_ostream(ostype), E| CfaEnum(E, quasi_void))
 ostype & ?|?(ostype& os, E e) {
-    return os | type_name(e) | "." | labelE(e);
+    return os | type_name(e) | "." | label(e);
 }
 
 forall(ostype & | basic_ostream(ostype), E, V| CfaEnum(E, V)) {
-    int ?==?(E l, E r) { return posE(l) == posE(r); }
-    int ?<=?(E l, E r) { return posE(l) <= posE(r); }
-    int ?>=?(E l, E r) { return posE(l) >= posE(r); }
-    int ?<?(E l, E r) { return posE(l) < posE(r); }
-    int ?>?(E l, E r) { return posE(l) > posE(r); }
+    int ?==?(E l, E r) { return posn(l) == posn(r); }
+    int ?<=?(E l, E r) { return posn(l) <= posn(r); }
+    int ?>=?(E l, E r) { return posn(l) >= posn(r); }
+    int ?<?(E l, E r) { return posn(l) < posn(r); }
+    int ?>?(E l, E r) { return posn(l) > posn(r); }
 }
Index: libcfa/src/enum.hfa
===================================================================
--- libcfa/src/enum.hfa	(revision 525f7ad65aaee3be785c86c188b191a2450ac8cc)
+++ libcfa/src/enum.hfa	(revision 089b39e10a2775643258a72adda3f50aeb1ed600)
@@ -17,11 +17,11 @@
 // Design one
 forall(E, V | Serial(E)) trait CfaEnum {
-    char* labelE(E e);
-    unsigned int posE(E e);
-    V valueE(E e);
-    char* type_name(E e);
+    char * label(E e);
+    unsigned int posn(E e);
+    V value(E e);
+    char * type_name(E e);
 };
 
-forall(ostype & | basic_ostream(ostype), E, V| CfaEnum(E, V))
+forall(ostype & | basic_ostream(ostype), E, V | CfaEnum(E, V))
 ostype & ?|?(ostype&, E);
 
@@ -31,10 +31,10 @@
 // Design two <- should go for this if we have change the cost model
 // forall(E | Serial(E)) trait CfaEnum {
-//     char* labelE(E e);
-//     unsigned int posE(E e);
+//     char * label(E e);
+//     unsigned int posn(E e);
 // };
 
 // forall(E, V| CfaEnum(E)) trait TypedEnum {
-//     V valueE(E e);
+//     V value(E e);
 // };