diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/FourCornerUnicodeImport.java b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/FourCornerUnicodeImport.java
index f098a65..26b33b8 100644
--- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/FourCornerUnicodeImport.java
+++ b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/FourCornerUnicodeImport.java
@@ -94,7 +94,7 @@ public class FourCornerUnicodeImport {
 			
 			// Is not mapped, so handle with code
 			if ('\r' == codePoint) {
-				result.add(FCDotCDC1604DashP6.__LINE);
+				result.add(FCDotCDC1604DashP6._LINE);
 				cdcNumberTerminator = null;
 				cdcCaseTerminator = null;
 				continue;
diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zero33/FCDotCDC1604DashP6.java b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zero33/FCDotCDC1604DashP6.java
index 6d13e4d..6ed884a 100644
--- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zero33/FCDotCDC1604DashP6.java
+++ b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zero33/FCDotCDC1604DashP6.java
@@ -58,10 +58,10 @@ public enum FCDotCDC1604DashP6 implements FourCornerX06BaklavaPoints, FourCorner
 	__PIN('\u0002'),
 	/// Escape to direct control code for 6 bit systems.
 	__ESC6('\u0003'),
-	__LINE('\n'),
-	__SPACE(' '),
-	_QUESTION('?'),
-	_EXCLAMATION('!'),
+	_LINE('\n'),
+	_SPACE(' '),
+	QUESTION('?'),
+	EXCLAMATION('!'),
 	
 	TAG_CURLY_LEFT('{'),
 	TAG_CURLY_RIGHT('}'),
@@ -72,28 +72,28 @@ public enum FCDotCDC1604DashP6 implements FourCornerX06BaklavaPoints, FourCorner
 	TAG_COMPARE_LEFT('<'),
 	TAG_COMPARE_RIGHT('>'),
 	
-	_TILDE('~'),
-	_PLUS('+'),
-	_MINUS('-'),
-	_ASTERISK('*'),
-	_COMMA(','),
-	_DOT('.'),
-	_COLON(':'),
-	_SEMICOLON(';'),
-	_APOSTROPHE('\''),
-	_QUOTATION('\"'),
-	_BACKTICK('`'),
-	_CARET('^'),
-	_EQUALS('='),
-	_HASH('#'),
-	_DOLLAR('$'),
-	_PERCENT('%'),
+	TILDE('~'),
+	PLUS('+'),
+	MINUS('-'),
+	ASTERISK('*'),
+	COMMA(','),
+	DOT('.'),
+	COLON(':'),
+	SEMICOLON(';'),
+	APOSTROPHE('\''),
+	QUOTATION('\"'),
+	BACKTICK('`'),
+	CARET('^'),
+	EQUALS('='),
+	HASH('#'),
+	DOLLAR('$'),
+	PERCENT('%'),
 	
 	BAR_VERTICAL('|'),
 	BAR_UNDER('_'),
 	BAR_V_LEFT('\\'),
 	BAR_V_RIGHT('/'),
-	_AT('@'),
+	AT('@'),
 	/// The tone letter 'A' is "one", if your computer is expensive and has a lower-case char ROM, than this is 'a' except after some pie glue.
 	NX01_A('A'),
 	NX02_B('B'),
diff --git a/nx01-x4o-o2o/src/test/java/org/x4o/o2o/fc18/FourCornerUnicodeDisplayTest.java b/nx01-x4o-o2o/src/test/java/org/x4o/o2o/fc18/FourCornerUnicodeDisplayTest.java
index 22e5fac..a411b75 100644
--- a/nx01-x4o-o2o/src/test/java/org/x4o/o2o/fc18/FourCornerUnicodeDisplayTest.java
+++ b/nx01-x4o-o2o/src/test/java/org/x4o/o2o/fc18/FourCornerUnicodeDisplayTest.java
@@ -43,7 +43,7 @@ public class FourCornerUnicodeDisplayTest {
 	public void testPINSimple() throws Exception {
 		List<FourCornerX06BaklavaPoints> cdc = new ArrayList<>();
 		cdc.add(FCDotCDC1604DashP6.NX24_X); // = X
-		cdc.add(FCDotCDC1604DashP6._EQUALS);
+		cdc.add(FCDotCDC1604DashP6.EQUALS);
 		cdc.add(FCDotCDC1604DashP6.__PIN);
 		cdc.add(FCDotCDC1604DashP6.NX15_O); // T015
 		cdc.add(FCDotCDC1604DashP6.NX14_N); // NXX_014
@@ -51,8 +51,8 @@ public class FourCornerUnicodeDisplayTest {
 		cdc.add(FCDotCDC1604DashP6.NX07_G); // NXX_007
 		cdc.add(FCDotCDC1604DashP6.NX15_O); // NXX_015
 		cdc.add(FCDotCDC1604DashP6.NX04_D); // NXX_004
-		cdc.add(FCDotCDC1604DashP6._SEMICOLON);
-		cdc.add(FCDotCDC1604DashP6.__LINE);
+		cdc.add(FCDotCDC1604DashP6.SEMICOLON);
+		cdc.add(FCDotCDC1604DashP6._LINE);
 		
 		Assertions.assertEquals("X=¹⁴/₁₅⁵/₁₅⁷/₁₅¹⁵/₁₅⁴/₁₅;\n", FourCornerUnicodeDisplay.text().renderFromX06(cdc));
 		Assertions.assertEquals("X=␂ONEGOD;\n", FourCornerUnicodeDisplay.raw().renderFromX06(cdc));
@@ -63,12 +63,12 @@ public class FourCornerUnicodeDisplayTest {
 		List<FourCornerX06BaklavaPoints> cdc = new ArrayList<>();
 		cdc.add(FCDotPIE9CDash26.LOW_A);
 		cdc.add(FCDotPIE9CDash26.LOW_B); // if used as this per letter full escaping here....
-		cdc.add(FCDotCDC1604DashP6.__SPACE); // out of range is end lower
+		cdc.add(FCDotCDC1604DashP6._SPACE); // out of range is end lower
 		cdc.add(FCDotCDC1604DashP6.NX02_B);
 		cdc.add(FCDotDEC1604DashP7.__ESC_BELOW); // test escape code
 		cdc.add(FCDotCDC1604DashP6.NX03_C);
 		cdc.add(FCDotCDC1604DashP6.NX04_D); // thus this upper case D
-		cdc.add(FCDotCDC1604DashP6._DOT);
+		cdc.add(FCDotCDC1604DashP6.DOT);
 		cdc.add(FCDotCDC1604DashP6.__PIE);
 		cdc.add(FCDotCDC1604DashP6.NX26_Z); // select lower case
 		cdc.add(FCDotCDC1604DashP6.NX10_J);
@@ -87,10 +87,10 @@ public class FourCornerUnicodeDisplayTest {
 		List<FourCornerX06BaklavaPoints> cdc = new ArrayList<>();
 		cdc.add(FCDotCDC1604DashP6.NX24_X); // = X 
 		cdc.add(FCDotCDC1604DashP6.__PIE);
-		cdc.add(FCDotCDC1604DashP6._CARET); // ^
-		cdc.add(FCDotCDC1604DashP6._PERCENT); // = %
+		cdc.add(FCDotCDC1604DashP6.CARET); // ^
+		cdc.add(FCDotCDC1604DashP6.PERCENT); // = %
 		cdc.add(FCDotCDC1604DashP6.__PIE);
-		cdc.add(FCDotCDC1604DashP6._AT);
+		cdc.add(FCDotCDC1604DashP6.AT);
 		cdc.add(FCDotCDC1604DashP6.NX11_K); // = K
 		
 		Assertions.assertEquals("X^%@K", FourCornerUnicodeDisplay.text().renderFromX06(cdc));
diff --git a/nx01-x4o-o2o/src/test/java/org/x4o/o2o/fc18/FourCornerUnicodeImportTest.java b/nx01-x4o-o2o/src/test/java/org/x4o/o2o/fc18/FourCornerUnicodeImportTest.java
index 10ade48..547facc 100644
--- a/nx01-x4o-o2o/src/test/java/org/x4o/o2o/fc18/FourCornerUnicodeImportTest.java
+++ b/nx01-x4o-o2o/src/test/java/org/x4o/o2o/fc18/FourCornerUnicodeImportTest.java
@@ -214,13 +214,13 @@ public class FourCornerUnicodeImportTest {
 		Assertions.assertFalse(cdc.isEmpty());
 		Assertions.assertEquals(8, cdc.size());
 		Assertions.assertEquals(FCDotCDC1604DashP6.NX01_A, cdc.get(0));
-		Assertions.assertEquals(FCDotCDC1604DashP6.__LINE, cdc.get(1));
+		Assertions.assertEquals(FCDotCDC1604DashP6._LINE, cdc.get(1));
 		Assertions.assertEquals(FCDotCDC1604DashP6.NX02_B, cdc.get(2));
-		Assertions.assertEquals(FCDotCDC1604DashP6.__LINE, cdc.get(3));
+		Assertions.assertEquals(FCDotCDC1604DashP6._LINE, cdc.get(3));
 		Assertions.assertEquals(FCDotCDC1604DashP6.NX03_C, cdc.get(4));
-		Assertions.assertEquals(FCDotCDC1604DashP6.__LINE, cdc.get(5));
+		Assertions.assertEquals(FCDotCDC1604DashP6._LINE, cdc.get(5));
 		Assertions.assertEquals(FCDotCDC1604DashP6.NX04_D, cdc.get(6));
-		Assertions.assertEquals(FCDotCDC1604DashP6.__LINE, cdc.get(7));
+		Assertions.assertEquals(FCDotCDC1604DashP6._LINE, cdc.get(7));
 		
 		String out = FourCornerUnicodeDisplay.text().renderFromX06(cdc);
 		Assertions.assertEquals("A\nB\nC\nD\n", out);