Renamed escape flags with correct bit type system target number

nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/FourCornerUnicodeDisplay.java

@@ -199,17 +199,17 @@ public class FourCornerUnicodeDisplay {
 			if (numberMode != null && (cdcPoint < FCDotCDC1604DashP6.NX01_A.ordinal())) {
 				numberMode = null; // below index 1 is end number mode
 			}
-			if (FCDotCDC1604DashP6.__PIE.ordinal() == cdcPoint || FCDotCDC1604DashP6.__PIN.ordinal() == cdcPoint) {
+			if (FCDotCDC1604DashP6.__PIE68.ordinal() == cdcPoint || FCDotCDC1604DashP6.__NCR68.ordinal() == cdcPoint) {
 				if (!cdc.hasNext()) {
 					break;
 				}
 				numberMode = cdc.next();
-				numberPIE = FCDotCDC1604DashP6.__PIE.ordinal() == cdcPoint; // is false for PIN
+				numberPIE = FCDotCDC1604DashP6.__PIE68.ordinal() == cdcPoint; // is false for PIN
 				if (renderHiddenControls) {
 					if (numberPIE) {
-						buf.append(FCDotCDC1604DashP6.escapeSignUnicode(FCDotCDC1604DashP6.__PIE.ordinal()));
+						buf.append(FCDotCDC1604DashP6.escapeSignUnicode(FCDotCDC1604DashP6.__PIE68.ordinal()));
 					} else {
-						buf.append(FCDotCDC1604DashP6.escapeSignUnicode(FCDotCDC1604DashP6.__PIN.ordinal()));
+						buf.append(FCDotCDC1604DashP6.escapeSignUnicode(FCDotCDC1604DashP6.__NCR68.ordinal()));
 					}
 					if (renderLookup) { // is already printed when disabled
 						buf.appendCodePoint(FCDotCDC1604DashP6.indexOf(numberMode).codePoints()[0]);
@@ -344,7 +344,7 @@ public class FourCornerUnicodeDisplay {
 		if (FCDotDEC1604DashP7.__ESC68_FC18.equals(decCode)) {
 			return decCode.ordinal(); // todo handle
 		}
-		if (FCDotDEC1604DashP7.__ESC_BELOW.equals(decCode)) {
+		if (FCDotDEC1604DashP7.__ESC68_BELOW.equals(decCode)) {
 			if (!cdc.hasNext()) {
 				return null;
 			}

nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/FourCornerUnicodeImport.java

@@ -104,7 +104,7 @@ public class FourCornerUnicodeImport {
 			if (bits != 18) { // 18 direct cake point is found by generic lookup
 				if (codePoint >= '0' && codePoint <= '9') {
 					if (!FCDotCDC1604DashP6.NX10_J.equals(cdcNumberTerminator)) {
-						result.add(FCDotCDC1604DashP6.__PIE);
+						result.add(FCDotCDC1604DashP6.__PIE68);
 						result.add(FCDotCDC1604DashP6.NX10_J);
 						cdcNumberTerminator = FCDotCDC1604DashP6.NX10_J;
 					}
@@ -128,7 +128,7 @@ public class FourCornerUnicodeImport {
 			if (bits != 18) { // 18 direct cake point is found by generic lookup
 				if (codePoint >= 'a' && codePoint <= 'z') {
 					if (!FCDotCDC1604DashP6.NX26_Z.equals(cdcCaseTerminator)) {
-						result.add(FCDotCDC1604DashP6.__PIE);
+						result.add(FCDotCDC1604DashP6.__PIE68);
 						result.add(FCDotCDC1604DashP6.NX26_Z);
 						cdcCaseTerminator = FCDotCDC1604DashP6.NX26_Z;
 					}

nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/pie9c/FCDotPIE9CDash01.java

@@ -52,7 +52,7 @@ public enum FCDotPIE9CDash01 implements FourCornerX06BaklavaPoints, FourCornerX0
 	
 	@Override
 	public int[] muffinPoints() {
-		return new int[] {FCDotCDC1604DashP6.__PIE.ordinal(), FCDotCDC1604DashP6.NX01_A.ordinal(), FCDotCDC1604DashP6.NX01_A.ordinal() + ordinal()};
+		return new int[] {FCDotCDC1604DashP6.__PIE68.ordinal(), FCDotCDC1604DashP6.NX01_A.ordinal(), FCDotCDC1604DashP6.NX01_A.ordinal() + ordinal()};
 	}
 	
 	@Override

nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/pie9c/FCDotPIE9CDash02.java

@@ -53,7 +53,7 @@ public enum FCDotPIE9CDash02 implements FourCornerX06BaklavaPoints, FourCornerX0
 	
 	@Override
 	public int[] muffinPoints() {
-		return new int[] {FCDotCDC1604DashP6.__PIE.ordinal(), FCDotCDC1604DashP6.NX02_B.ordinal(), FCDotCDC1604DashP6.NX01_A.ordinal() + ordinal()};
+		return new int[] {FCDotCDC1604DashP6.__PIE68.ordinal(), FCDotCDC1604DashP6.NX02_B.ordinal(), FCDotCDC1604DashP6.NX01_A.ordinal() + ordinal()};
 	}
 	
 	@Override

nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/pie9c/FCDotPIE9CDash03.java

@@ -54,7 +54,7 @@ public enum FCDotPIE9CDash03 implements FourCornerX06BaklavaPoints, FourCornerX0
 	
 	@Override
 	public int[] muffinPoints() {
-		return new int[] {FCDotCDC1604DashP6.__PIE.ordinal(), FCDotCDC1604DashP6.NX03_C.ordinal(), FCDotCDC1604DashP6.NX01_A.ordinal() + ordinal()};
+		return new int[] {FCDotCDC1604DashP6.__PIE68.ordinal(), FCDotCDC1604DashP6.NX03_C.ordinal(), FCDotCDC1604DashP6.NX01_A.ordinal() + ordinal()};
 	}
 	
 	@Override

nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/pie9c/FCDotPIE9CDash04.java

@@ -55,7 +55,7 @@ public enum FCDotPIE9CDash04 implements FourCornerX06BaklavaPoints, FourCornerX0
 	
 	@Override
 	public int[] muffinPoints() {
-		return new int[] {FCDotCDC1604DashP6.__PIE.ordinal(), FCDotCDC1604DashP6.NX04_D.ordinal(), FCDotCDC1604DashP6.NX01_A.ordinal() + ordinal()};
+		return new int[] {FCDotCDC1604DashP6.__PIE68.ordinal(), FCDotCDC1604DashP6.NX04_D.ordinal(), FCDotCDC1604DashP6.NX01_A.ordinal() + ordinal()};
 	}
 	
 	@Override

nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/pie9c/FCDotPIE9CDash05.java

@@ -56,7 +56,7 @@ public enum FCDotPIE9CDash05 implements FourCornerX06BaklavaPoints, FourCornerX0
 	
 	@Override
 	public int[] muffinPoints() {
-		return new int[] {FCDotCDC1604DashP6.__PIE.ordinal(), FCDotCDC1604DashP6.NX05_E.ordinal(), FCDotCDC1604DashP6.NX01_A.ordinal() + ordinal()};
+		return new int[] {FCDotCDC1604DashP6.__PIE68.ordinal(), FCDotCDC1604DashP6.NX05_E.ordinal(), FCDotCDC1604DashP6.NX01_A.ordinal() + ordinal()};
 	}
 	
 	@Override

nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/pie9c/FCDotPIE9CDash06.java

@@ -57,7 +57,7 @@ public enum FCDotPIE9CDash06 implements FourCornerX06BaklavaPoints, FourCornerX0
 	
 	@Override
 	public int[] muffinPoints() {
-		return new int[] {FCDotCDC1604DashP6.__PIE.ordinal(), FCDotCDC1604DashP6.NX06_F.ordinal(), FCDotCDC1604DashP6.NX01_A.ordinal() + ordinal()};
+		return new int[] {FCDotCDC1604DashP6.__PIE68.ordinal(), FCDotCDC1604DashP6.NX06_F.ordinal(), FCDotCDC1604DashP6.NX01_A.ordinal() + ordinal()};
 	}
 	
 	@Override

nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/pie9c/FCDotPIE9CDash07.java

@@ -58,7 +58,7 @@ public enum FCDotPIE9CDash07 implements FourCornerX06BaklavaPoints, FourCornerX0
 	
 	@Override
 	public int[] muffinPoints() {
-		return new int[] {FCDotCDC1604DashP6.__PIE.ordinal(), FCDotCDC1604DashP6.NX07_G.ordinal(), FCDotCDC1604DashP6.NX01_A.ordinal() + ordinal()};
+		return new int[] {FCDotCDC1604DashP6.__PIE68.ordinal(), FCDotCDC1604DashP6.NX07_G.ordinal(), FCDotCDC1604DashP6.NX01_A.ordinal() + ordinal()};
 	}
 	
 	@Override

nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/pie9c/FCDotPIE9CDash08.java

@@ -59,7 +59,7 @@ public enum FCDotPIE9CDash08 implements FourCornerX06BaklavaPoints, FourCornerX0
 	
 	@Override
 	public int[] muffinPoints() {
-		return new int[] {FCDotCDC1604DashP6.__PIE.ordinal(), FCDotCDC1604DashP6.NX08_H.ordinal(), FCDotCDC1604DashP6.NX01_A.ordinal() + ordinal()};
+		return new int[] {FCDotCDC1604DashP6.__PIE68.ordinal(), FCDotCDC1604DashP6.NX08_H.ordinal(), FCDotCDC1604DashP6.NX01_A.ordinal() + ordinal()};
 	}
 	
 	@Override

nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/pie9c/FCDotPIE9CDash09.java

@@ -60,7 +60,7 @@ public enum FCDotPIE9CDash09 implements FourCornerX06BaklavaPoints, FourCornerX0
 	
 	@Override
 	public int[] muffinPoints() {
-		return new int[] {FCDotCDC1604DashP6.__PIE.ordinal(), FCDotCDC1604DashP6.NX09_I.ordinal(), FCDotCDC1604DashP6.NX01_A.ordinal() + ordinal()};
+		return new int[] {FCDotCDC1604DashP6.__PIE68.ordinal(), FCDotCDC1604DashP6.NX09_I.ordinal(), FCDotCDC1604DashP6.NX01_A.ordinal() + ordinal()};
 	}
 	
 	@Override

nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/pie9c/FCDotPIE9CDash10.java

@@ -61,7 +61,7 @@ public enum FCDotPIE9CDash10 implements FourCornerX06BaklavaPoints, FourCornerX0
 	
 	@Override
 	public int[] muffinPoints() {
-		return new int[] {FCDotCDC1604DashP6.__PIE.ordinal(), FCDotCDC1604DashP6.NX10_J.ordinal(), FCDotCDC1604DashP6.NX01_A.ordinal() + ordinal()};
+		return new int[] {FCDotCDC1604DashP6.__PIE68.ordinal(), FCDotCDC1604DashP6.NX10_J.ordinal(), FCDotCDC1604DashP6.NX01_A.ordinal() + ordinal()};
 	}
 	
 	@Override

nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/pie9c/FCDotPIE9CDash11.java

@@ -62,7 +62,7 @@ public enum FCDotPIE9CDash11 implements FourCornerX06BaklavaPoints, FourCornerX0
 	
 	@Override
 	public int[] muffinPoints() {
-		return new int[] {FCDotCDC1604DashP6.__PIE.ordinal(), FCDotCDC1604DashP6.NX11_K.ordinal(), FCDotCDC1604DashP6.NX01_A.ordinal() + ordinal()};
+		return new int[] {FCDotCDC1604DashP6.__PIE68.ordinal(), FCDotCDC1604DashP6.NX11_K.ordinal(), FCDotCDC1604DashP6.NX01_A.ordinal() + ordinal()};
 	}
 	
 	@Override

nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/pie9c/FCDotPIE9CDash12.java

@@ -63,7 +63,7 @@ public enum FCDotPIE9CDash12 implements FourCornerX06BaklavaPoints, FourCornerX0
 	
 	@Override
 	public int[] muffinPoints() {
-		return new int[] {FCDotCDC1604DashP6.__PIE.ordinal(), FCDotCDC1604DashP6.NX12_L.ordinal(), FCDotCDC1604DashP6.NX01_A.ordinal() + ordinal()};
+		return new int[] {FCDotCDC1604DashP6.__PIE68.ordinal(), FCDotCDC1604DashP6.NX12_L.ordinal(), FCDotCDC1604DashP6.NX01_A.ordinal() + ordinal()};
 	}
 	
 	@Override

nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/pie9c/FCDotPIE9CDash13.java

@@ -64,7 +64,7 @@ public enum FCDotPIE9CDash13 implements FourCornerX06BaklavaPoints, FourCornerX0
 	
 	@Override
 	public int[] muffinPoints() {
-		return new int[] {FCDotCDC1604DashP6.__PIE.ordinal(), FCDotCDC1604DashP6.NX13_M.ordinal(), FCDotCDC1604DashP6.NX01_A.ordinal() + ordinal()};
+		return new int[] {FCDotCDC1604DashP6.__PIE68.ordinal(), FCDotCDC1604DashP6.NX13_M.ordinal(), FCDotCDC1604DashP6.NX01_A.ordinal() + ordinal()};
 	}
 	
 	@Override

nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/pie9c/FCDotPIE9CDash14.java

@@ -65,7 +65,7 @@ public enum FCDotPIE9CDash14 implements FourCornerX06BaklavaPoints, FourCornerX0
 	
 	@Override
 	public int[] muffinPoints() {
-		return new int[] {FCDotCDC1604DashP6.__PIE.ordinal(), FCDotCDC1604DashP6.NX14_N.ordinal(), FCDotCDC1604DashP6.NX01_A.ordinal() + ordinal()};
+		return new int[] {FCDotCDC1604DashP6.__PIE68.ordinal(), FCDotCDC1604DashP6.NX14_N.ordinal(), FCDotCDC1604DashP6.NX01_A.ordinal() + ordinal()};
 	}
 	
 	@Override

nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/pie9c/FCDotPIE9CDash15.java

@@ -66,7 +66,7 @@ public enum FCDotPIE9CDash15 implements FourCornerX06BaklavaPoints, FourCornerX0
 	
 	@Override
 	public int[] muffinPoints() {
-		return new int[] {FCDotCDC1604DashP6.__PIE.ordinal(), FCDotCDC1604DashP6.NX15_O.ordinal(), FCDotCDC1604DashP6.NX01_A.ordinal() + ordinal()};
+		return new int[] {FCDotCDC1604DashP6.__PIE68.ordinal(), FCDotCDC1604DashP6.NX15_O.ordinal(), FCDotCDC1604DashP6.NX01_A.ordinal() + ordinal()};
 	}
 	
 	@Override

nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/pie9c/FCDotPIE9CDash16.java

@@ -67,7 +67,7 @@ public enum FCDotPIE9CDash16 implements FourCornerX06BaklavaPoints, FourCornerX0
 	
 	@Override
 	public int[] muffinPoints() {
-		return new int[] {FCDotCDC1604DashP6.__PIE.ordinal(), FCDotCDC1604DashP6.NX16_P.ordinal(), FCDotCDC1604DashP6.NX01_A.ordinal() + ordinal()};
+		return new int[] {FCDotCDC1604DashP6.__PIE68.ordinal(), FCDotCDC1604DashP6.NX16_P.ordinal(), FCDotCDC1604DashP6.NX01_A.ordinal() + ordinal()};
 	}
 	
 	@Override

nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/pie9c/FCDotPIE9CDash17.java

@@ -68,7 +68,7 @@ public enum FCDotPIE9CDash17 implements FourCornerX06BaklavaPoints, FourCornerX0
 	
 	@Override
 	public int[] muffinPoints() {
-		return new int[] {FCDotCDC1604DashP6.__PIE.ordinal(), FCDotCDC1604DashP6.NX17_Q.ordinal(), FCDotCDC1604DashP6.NX01_A.ordinal() + ordinal()};
+		return new int[] {FCDotCDC1604DashP6.__PIE68.ordinal(), FCDotCDC1604DashP6.NX17_Q.ordinal(), FCDotCDC1604DashP6.NX01_A.ordinal() + ordinal()};
 	}
 	
 	@Override

nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/pie9c/FCDotPIE9CDash18.java

@@ -69,7 +69,7 @@ public enum FCDotPIE9CDash18 implements FourCornerX06BaklavaPoints, FourCornerX0
 	
 	@Override
 	public int[] muffinPoints() {
-		return new int[] {FCDotCDC1604DashP6.__PIE.ordinal(), FCDotCDC1604DashP6.NX18_R.ordinal(), FCDotCDC1604DashP6.NX01_A.ordinal() + ordinal()};
+		return new int[] {FCDotCDC1604DashP6.__PIE68.ordinal(), FCDotCDC1604DashP6.NX18_R.ordinal(), FCDotCDC1604DashP6.NX01_A.ordinal() + ordinal()};
 	}
 	
 	@Override

nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/pie9c/FCDotPIE9CDash19.java

@@ -70,7 +70,7 @@ public enum FCDotPIE9CDash19 implements FourCornerX06BaklavaPoints, FourCornerX0
 	
 	@Override
 	public int[] muffinPoints() {
-		return new int[] {FCDotCDC1604DashP6.__PIE.ordinal(), FCDotCDC1604DashP6.NX19_S.ordinal(), FCDotCDC1604DashP6.NX01_A.ordinal() + ordinal()};
+		return new int[] {FCDotCDC1604DashP6.__PIE68.ordinal(), FCDotCDC1604DashP6.NX19_S.ordinal(), FCDotCDC1604DashP6.NX01_A.ordinal() + ordinal()};
 	}
 	
 	@Override

nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/pie9c/FCDotPIE9CDash20.java

@@ -75,7 +75,7 @@ public enum FCDotPIE9CDash20 implements FourCornerX06BaklavaPoints, FourCornerX0
 	
 	@Override
 	public int[] muffinPoints() {
-		return new int[] {FCDotCDC1604DashP6.__PIE.ordinal(), FCDotCDC1604DashP6.NX20_T.ordinal(), FCDotCDC1604DashP6.NX01_A.ordinal() + ordinal()};
+		return new int[] {FCDotCDC1604DashP6.__PIE68.ordinal(), FCDotCDC1604DashP6.NX20_T.ordinal(), FCDotCDC1604DashP6.NX01_A.ordinal() + ordinal()};
 	}
 	
 	@Override

nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/pie9c/FCDotPIE9CDash21.java

@@ -72,7 +72,7 @@ public enum FCDotPIE9CDash21 implements FourCornerX06BaklavaPoints, FourCornerX0
 	
 	@Override
 	public int[] muffinPoints() {
-		return new int[] {FCDotCDC1604DashP6.__PIE.ordinal(), FCDotCDC1604DashP6.NX21_U.ordinal(), FCDotCDC1604DashP6.NX01_A.ordinal() + ordinal()};
+		return new int[] {FCDotCDC1604DashP6.__PIE68.ordinal(), FCDotCDC1604DashP6.NX21_U.ordinal(), FCDotCDC1604DashP6.NX01_A.ordinal() + ordinal()};
 	}
 	
 	@Override

nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/pie9c/FCDotPIE9CDash22.java

@@ -73,7 +73,7 @@ public enum FCDotPIE9CDash22 implements FourCornerX06BaklavaPoints, FourCornerX0
 	
 	@Override
 	public int[] muffinPoints() {
-		return new int[] {FCDotCDC1604DashP6.__PIE.ordinal(), FCDotCDC1604DashP6.NX22_V.ordinal(), FCDotCDC1604DashP6.NX01_A.ordinal() + ordinal()};
+		return new int[] {FCDotCDC1604DashP6.__PIE68.ordinal(), FCDotCDC1604DashP6.NX22_V.ordinal(), FCDotCDC1604DashP6.NX01_A.ordinal() + ordinal()};
 	}
 	
 	@Override

nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/pie9c/FCDotPIE9CDash23.java

@@ -74,7 +74,7 @@ public enum FCDotPIE9CDash23 implements FourCornerX06BaklavaPoints, FourCornerX0
 	
 	@Override
 	public int[] muffinPoints() {
-		return new int[] {FCDotCDC1604DashP6.__PIE.ordinal(), FCDotCDC1604DashP6.NX23_W.ordinal(), FCDotCDC1604DashP6.NX01_A.ordinal() + ordinal()};
+		return new int[] {FCDotCDC1604DashP6.__PIE68.ordinal(), FCDotCDC1604DashP6.NX23_W.ordinal(), FCDotCDC1604DashP6.NX01_A.ordinal() + ordinal()};
 	}
 	
 	@Override

nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/pie9c/FCDotPIE9CDash24.java

@@ -75,7 +75,7 @@ public enum FCDotPIE9CDash24 implements FourCornerX06BaklavaPoints, FourCornerX0
 	
 	@Override
 	public int[] muffinPoints() {
-		return new int[] {FCDotCDC1604DashP6.__PIE.ordinal(), FCDotCDC1604DashP6.NX24_X.ordinal(), FCDotCDC1604DashP6.NX01_A.ordinal() + ordinal()};
+		return new int[] {FCDotCDC1604DashP6.__PIE68.ordinal(), FCDotCDC1604DashP6.NX24_X.ordinal(), FCDotCDC1604DashP6.NX01_A.ordinal() + ordinal()};
 	}
 	
 	@Override

nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/pie9c/FCDotPIE9CDash25.java

@@ -76,7 +76,7 @@ public enum FCDotPIE9CDash25 implements FourCornerX06BaklavaPoints, FourCornerX0
 	
 	@Override
 	public int[] muffinPoints() {
-		return new int[] {FCDotCDC1604DashP6.__PIE.ordinal(), FCDotCDC1604DashP6.NX25_Y.ordinal(), FCDotCDC1604DashP6.NX01_A.ordinal() + ordinal()};
+		return new int[] {FCDotCDC1604DashP6.__PIE68.ordinal(), FCDotCDC1604DashP6.NX25_Y.ordinal(), FCDotCDC1604DashP6.NX01_A.ordinal() + ordinal()};
 	}
 	
 	@Override

nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/pie9c/FCDotPIE9CDash26.java

@@ -77,7 +77,7 @@ public enum FCDotPIE9CDash26 implements FourCornerX06BaklavaPoints, FourCornerX0
 	
 	@Override
 	public int[] muffinPoints() {
-		return new int[] {FCDotCDC1604DashP6.__PIE.ordinal(), FCDotCDC1604DashP6.NX26_Z.ordinal(), FCDotCDC1604DashP6.NX01_A.ordinal() + ordinal()};
+		return new int[] {FCDotCDC1604DashP6.__PIE68.ordinal(), FCDotCDC1604DashP6.NX26_Z.ordinal(), FCDotCDC1604DashP6.NX01_A.ordinal() + ordinal()};
 	}
 	
 	@Override

nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/pie9c/FCDotPIE9CDash27.java

@@ -78,7 +78,7 @@ public enum FCDotPIE9CDash27 implements FourCornerX06BaklavaPoints, FourCornerX0
 	
 	@Override
 	public int[] muffinPoints() {
-		return new int[] {FCDotCDC1604DashP6.__PIE.ordinal(), FCDotCDC1604DashP6.NX27_AMPERSAND.ordinal(), FCDotCDC1604DashP6.NX01_A.ordinal() + ordinal()};
+		return new int[] {FCDotCDC1604DashP6.__PIE68.ordinal(), FCDotCDC1604DashP6.NX27_AMPERSAND.ordinal(), FCDotCDC1604DashP6.NX01_A.ordinal() + ordinal()};
 	}
 	
 	@Override

nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zero33/FCDotCDC1604DashP6.java

@@ -48,14 +48,14 @@ public enum FCDotCDC1604DashP6 implements FourCornerX06BaklavaPoints, FourCorner
 	
 	/// Indicator for termination of pussy strings, which is the compatibility duel octal, with the CDC 1604 computers.
 	__NUL('\u0000'),
-	/// Select packed pie terminator symbol.
+	/// Select packed pie terminator symbol on 6 and 8 bit systems.
 	/// A = 1, first P6 is terminator select, than next P6 _A++ select pie part 1-27, until other P6 stops it.
 	/// Example ascii "012" is
 	/// 012 = __PIE NX10_J NX01_A NX02_B NX02_C
-	__PIE('\u0001'),
+	__PIE68('\u0001'),
-	/// Select packed pie terminator number.
+	/// Select packed pie terminator number for 6 and 8 bit systems.
 	/// First NXX P6 is terminator select, than next NXX P6 are values, until out of range.
-	__PIN('\u0002'),
+	__NCR68('\u0002'),
 	/// Escape to direct control code for 6 bit systems.
 	__ESC6('\u0003'),
 	_LINE('\n'),

nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/zero33/FCDotDEC1604DashP7.java

@@ -55,8 +55,8 @@ public enum FCDotDEC1604DashP7 implements FourCornerX06BaklavaPoints, FourCorner
 	/// On 6/8 bit escape to 18 bit four corner. 
 	/// Stream six octals as CDC chars in NX01_A to NX08_H, until any out of range P6.
 	__ESC68_FC18,
-	/// Lower case escape code for only ONE next char is NX01_A to NX06_Z
+	/// Lower case escape code for only ONE next char is NX01_A to NX06_Z for 6 and 8 bit systems.
-	__ESC_BELOW,
+	__ESC68_BELOW,
 	
 	UNDEFINED__QUESTION,
 	UNDEFINED__EXCLAMATION,

nx01-x4o-o2o/src/test/java/org/x4o/o2o/fc18/FourCornerUnicodeDisplayTest.java

@@ -47,7 +47,7 @@ public class FourCornerUnicodeDisplayTest {
 		List<FourCornerX06BaklavaPoints> cdc = new ArrayList<>();
 		cdc.add(FCDotCDC1604DashP6.NX24_X); // = X
 		cdc.add(FCDotCDC1604DashP6.EQUALS);
-		cdc.add(FCDotCDC1604DashP6.__PIN);
+		cdc.add(FCDotCDC1604DashP6.__NCR68);
 		cdc.add(FCDotCDC1604DashP6.NX15_O); // T015
 		cdc.add(FCDotCDC1604DashP6.NX14_N); // NXX_014
 		cdc.add(FCDotCDC1604DashP6.NX05_E); // NXX_005
@@ -102,11 +102,11 @@ public class FourCornerUnicodeDisplayTest {
 		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.NX02_B);
-		cdc.add(FCDotDEC1604DashP7.__ESC_BELOW); // test escape code
+		cdc.add(FCDotDEC1604DashP7.__ESC68_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.__PIE);
+		cdc.add(FCDotCDC1604DashP6.__PIE68);
 		cdc.add(FCDotCDC1604DashP6.NX26_Z); // select lower case
 		cdc.add(FCDotCDC1604DashP6.NX10_J);
 		cdc.add(FCDotCDC1604DashP6.NX11_K);
@@ -123,10 +123,10 @@ public class FourCornerUnicodeDisplayTest {
 	public void testNumberTerminatorOutOfRange() throws Exception {
 		List<FourCornerX06BaklavaPoints> cdc = new ArrayList<>();
 		cdc.add(FCDotCDC1604DashP6.NX24_X); // = X 
-		cdc.add(FCDotCDC1604DashP6.__PIE);
+		cdc.add(FCDotCDC1604DashP6.__PIE68);
 		cdc.add(FCDotCDC1604DashP6.CARET); // ^
 		cdc.add(FCDotCDC1604DashP6.PERCENT); // = %
-		cdc.add(FCDotCDC1604DashP6.__PIE);
+		cdc.add(FCDotCDC1604DashP6.__PIE68);
 		cdc.add(FCDotCDC1604DashP6.AT);
 		cdc.add(FCDotCDC1604DashP6.NX11_K); // = K
 		
@@ -136,10 +136,10 @@ public class FourCornerUnicodeDisplayTest {
 	@Test
 	public void testNumberPieOutOfRange() throws Exception {
 		List<FourCornerX06BaklavaPoints> cdc = new ArrayList<>();
-		cdc.add(FCDotCDC1604DashP6.__PIE);
+		cdc.add(FCDotCDC1604DashP6.__PIE68);
 		cdc.add(FCDotCDC1604DashP6.NX01_A);
 		cdc.add(FCDotCDC1604DashP6.NX02_B); // B
-		cdc.add(FCDotCDC1604DashP6.__PIE);
+		cdc.add(FCDotCDC1604DashP6.__PIE68);
 		cdc.add(FCDotCDC1604DashP6.NX10_J);
 		cdc.add(FCDotCDC1604DashP6.NX04_D); // 3
 		cdc.add(FCDotCDC1604DashP6.NX11_K); // K

nx01-x4o-o2o/src/test/java/org/x4o/o2o/fc18/FourCornerUnicodeImportTest.java

@@ -62,7 +62,7 @@ public class FourCornerUnicodeImportTest {
 		Assertions.assertNotNull(cdc);
 		Assertions.assertFalse(cdc.isEmpty());
 		Assertions.assertEquals(8, cdc.size());
-		Assertions.assertEquals(FCDotCDC1604DashP6.__PIE, cdc.get(0));
+		Assertions.assertEquals(FCDotCDC1604DashP6.__PIE68, cdc.get(0));
 		Assertions.assertEquals(FCDotCDC1604DashP6.NX26_Z, cdc.get(1));
 		Assertions.assertEquals(FCDotCDC1604DashP6.NX06_F, cdc.get(2));
 		Assertions.assertEquals(FCDotCDC1604DashP6.NX15_O, cdc.get(3));
@@ -81,7 +81,7 @@ public class FourCornerUnicodeImportTest {
 		Assertions.assertNotNull(cdc);
 		Assertions.assertFalse(cdc.isEmpty());
 		Assertions.assertEquals(10, cdc.size()); // = 60 bit
-		Assertions.assertEquals(FCDotCDC1604DashP6.__PIE, cdc.get(0));
+		Assertions.assertEquals(FCDotCDC1604DashP6.__PIE68, cdc.get(0));
 		Assertions.assertEquals(FCDotCDC1604DashP6.NX26_Z, cdc.get(1));
 		Assertions.assertEquals(FCDotCDC1604DashP6.NX06_F, cdc.get(2));
 		Assertions.assertEquals(FCDotCDC1604DashP6.NX15_O, cdc.get(3));
@@ -102,7 +102,7 @@ public class FourCornerUnicodeImportTest {
 		Assertions.assertNotNull(cdc);
 		Assertions.assertFalse(cdc.isEmpty());
 		Assertions.assertEquals(9, cdc.size()); // = 72 bit
-		Assertions.assertEquals(FCDotCDC1604DashP6.__PIE, cdc.get(0));
+		Assertions.assertEquals(FCDotCDC1604DashP6.__PIE68, cdc.get(0));
 		Assertions.assertEquals(FCDotCDC1604DashP6.NX26_Z, cdc.get(1));
 		Assertions.assertEquals(FCDotCDC1604DashP6.NX06_F, cdc.get(2));
 		Assertions.assertEquals(FCDotCDC1604DashP6.NX15_O, cdc.get(3));
@@ -152,7 +152,7 @@ public class FourCornerUnicodeImportTest {
 		Assertions.assertNotNull(cdc);
 		Assertions.assertFalse(cdc.isEmpty());
 		Assertions.assertEquals(10, cdc.size());
-		Assertions.assertEquals(FCDotCDC1604DashP6.__PIE, cdc.get(0));
+		Assertions.assertEquals(FCDotCDC1604DashP6.__PIE68, cdc.get(0));
 		Assertions.assertEquals(FCDotCDC1604DashP6.NX10_J, cdc.get(1));
 		Assertions.assertEquals(FCDotCDC1604DashP6.NX01_A, cdc.get(2)); // 0
 		Assertions.assertEquals(FCDotCDC1604DashP6.NX02_B, cdc.get(3)); // 1
@@ -173,7 +173,7 @@ public class FourCornerUnicodeImportTest {
 		Assertions.assertNotNull(cdc);
 		Assertions.assertFalse(cdc.isEmpty());
 		Assertions.assertEquals(10, cdc.size());
-		Assertions.assertEquals(FCDotCDC1604DashP6.__PIE, cdc.get(0));
+		Assertions.assertEquals(FCDotCDC1604DashP6.__PIE68, cdc.get(0));
 		Assertions.assertEquals(FCDotCDC1604DashP6.NX10_J, cdc.get(1));
 		Assertions.assertEquals(FCDotCDC1604DashP6.NX01_A, cdc.get(2)); // 0
 		Assertions.assertEquals(FCDotCDC1604DashP6.NX02_B, cdc.get(3)); // 1

nx01-x4o-o2o/src/test/java/org/x4o/o2o/fc18/FourCornerWriteExampleMD.java

@@ -262,7 +262,7 @@ public class FourCornerWriteExampleMD {
 					continue;
 				}
 				List<Integer> piNum = new ArrayList<>();
-				piNum.add(FCDotCDC1604DashP6.__PIN.ordinal());
+				piNum.add(FCDotCDC1604DashP6.__NCR68.ordinal());
 				piNum.add(FCDotCDC1604DashP6.NX01_A.ordinal() + t);
 				piNum.add(FCDotCDC1604DashP6.NX01_A.ordinal() + i);
 				String char18Str = FourCornerUnicodeDisplay.text().renderFromInt18(piNum);