diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/clk1k/FCDotCLK1KDashS.java b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/clk1k/FCDotCLK1KDashS.java
index 1cee8f7..7f605e1 100644
--- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/clk1k/FCDotCLK1KDashS.java
+++ b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/clk1k/FCDotCLK1KDashS.java
@@ -60,9 +60,6 @@ public enum FCDotCLK1KDashS implements FCDotCLKSourceCakePoints {
 	SYNCHRONIZED(FCDotCLKSource.CPP, FCDotCLKSource.JAVA),
 	STRICTFP(FCDotCLKSource.JAVA),
 	SUPER(FCDotCLKSource.JAVA, FCDotCLKSource.RUST, FCDotCLKSource.ES6),
-	// NOTE: Example dedup move SELF and SELF_TYPE to THIS/THIS_TYPE with aliases for RUST
-	SELF(FCDotCLKSource.RUST, FCDotCLKSource.PYTHON),
-	SELF_TYPE(FCDotCLKSource.RUST.toQNameAlias("Self")),
 	STATIC_LIFE(FCDotCLKSource.RUST.toQNameAlias("'static")),
 	SAFE(FCDotCLKSource.RUST),
 	;
diff --git a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/clk1k/FCDotCLK1KDashT.java b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/clk1k/FCDotCLK1KDashT.java
index db29a9f..c0c2c02 100644
--- a/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/clk1k/FCDotCLK1KDashT.java
+++ b/nx01-x4o-o2o/src/main/java/org/x4o/o2o/fc18/clk1k/FCDotCLK1KDashT.java
@@ -42,7 +42,13 @@ public enum FCDotCLK1KDashT implements FCDotCLKSourceCakePoints {
 	TRANSPORT(FCDotCLKSource.VHDL),
 	TYPE(FCDotCLKSource.VHDL, FCDotCLKSource.RUST),
 	TEMPLATE(FCDotCLKSource.CPP),
-	THIS(FCDotCLKSource.CPP, FCDotCLKSource.JAVA, FCDotCLKSource.ES6),
+	THIS(FCDotCLKSource.CPP,
+			FCDotCLKSource.JAVA,
+			FCDotCLKSource.ES6,
+			FCDotCLKSource.RUST.toQNameAlias("self"),
+			FCDotCLKSource.PYTHON.toQNameAlias("self")
+			),
+	THIS_TYPE(FCDotCLKSource.RUST.toQNameAlias("Self")),
 	THREAD_LOCAL(FCDotCLKSource.CPP),
 	THROW(FCDotCLKSource.CPP, FCDotCLKSource.JAVA, FCDotCLKSource.ES6),
 	TRUE(FCDotCLKSource.CPP,