@tuprolog/2p-full 0.32.4 → 1.0.0

package/2p-oop-lib.js

@@ -185,18 +185,18 @@
   setMetadataFor(Value, 'Value', classMeta, Result);
   setMetadataFor(Companion_2, 'Companion', objectMeta);
   function convert(term) {
-    return this.f3p(this.h3p(term), term);
+    return this.w3p(this.y3p(term), term);
   }
   setMetadataFor(TermToObjectConverter, 'TermToObjectConverter', interfaceMeta);
   setMetadataFor(Companion_3, 'Companion', objectMeta);
   function typeRefFromName(typeName) {
-    var tmp = Companion_instance.ar(this.k3p(typeName));
+    var tmp = Companion_instance.ar(this.b3q(typeName));
     return tmp.st(TypeFactory$typeRefFromName$lambda).r2();
   }
   setMetadataFor(TypeFactory, 'TypeFactory', interfaceMeta);
   setMetadataFor(Companion_4, 'Companion', objectMeta);
   function create(objectConverter, arguments_0) {
-    return this.n3p(objectConverter, listOf(arguments_0.slice()));
+    return this.e3q(objectConverter, listOf(arguments_0.slice()));
   }
   setMetadataFor(TypeRef, 'TypeRef', interfaceMeta, VOID, [Ref]);
   setMetadataFor(OopException, 'OopException', classMeta, TuPrologException);
@@ -249,11 +249,11 @@
   function NullRef() {
   }
   function OOP() {
-    this.j3o_1 = '.';
-    this.k3o_1 = ':=';
-    this.l3o_1 = '$';
-    this.m3o_1 = 'as';
-    this.n3o_1 = 'alias';
+    this.a3p_1 = '.';
+    this.b3p_1 = ':=';
+    this.c3p_1 = '$';
+    this.d3p_1 = 'as';
+    this.e3p_1 = 'alias';
   }
   var OOP_instance;
   function OOP_getInstance() {
@@ -263,10 +263,10 @@
     OOPLib_instance = this;
     AbstractLibrary.call(this);
   }
-  protoOf(OOPLib).s2d = function () {
+  protoOf(OOPLib).j2e = function () {
     return 'prolog.oop';
   };
-  protoOf(OOPLib).r2d = function () {
+  protoOf(OOPLib).i2e = function () {
     // Inline function 'kotlin.collections.map' call
     var this_0 = listOf([ArrayItems_getInstance(), Assign_getInstance(), Cast_getInstance(), Type_getInstance(), InvokeMethod_getInstance(), InvokeStrict_getInstance(), ListItems_getInstance(), NewObject3_getInstance(), NullRef_getInstance(), ObjectRef_getInstance(), Ref_getInstance(), Register_getInstance(), SetItems_getInstance(), TypeRef_getInstance(), Unregister_getInstance()]);
     // Inline function 'kotlin.collections.mapTo' call
@@ -276,26 +276,26 @@
       var item = tmp0_iterator.u();
       // Inline function 'it.unibo.tuprolog.solve.libs.oop.OOPLib.<get-primitives>.<anonymous>' call
       // Inline function 'it.unibo.tuprolog.solve.AbstractWrapper.descriptionPair' call
-      var tmp$ret$1 = to(item.signature, item.i1u());
+      var tmp$ret$1 = to(item.signature, item.q1u());
       destination.o(tmp$ret$1);
     }
     return toMap(destination);
   };
-  protoOf(OOPLib).t1l = function () {
+  protoOf(OOPLib).p1l = function () {
     // Inline function 'kotlin.collections.map' call
-    var this_0 = listOf(arrayConcat([[Cast_getInstance_0(), Invocation_getInstance(), Assignment_getInstance(), Dot_getInstance(), Recursive_getInstance(), Couple_getInstance(), Trivial_getInstance(), NewObject2_getInstance(), Recursive_getInstance_0(), Base_getInstance(), Companion_instance_15.q3o('string', PrimitiveClasses_getInstance().m7()), Companion_instance_15.q3o('array', PrimitiveClasses_getInstance().l7()), Companion_instance_15.q3o('list', getKClass(List)), Companion_instance_15.q3o('arraylist', getKClass(ArrayList)), Companion_instance_15.q3o('map', getKClass(Map)), Companion_instance_15.q3o('hashmap', getKClass(LinkedHashMap)), Companion_instance_15.q3o('int', PrimitiveClasses_getInstance().i7()), Companion_instance_15.q3o('integer', PrimitiveClasses_getInstance().i7()), Companion_instance_15.q3o('double', PrimitiveClasses_getInstance().k7()), Companion_instance_15.q3o('float', PrimitiveClasses_getInstance().j7()), Companion_instance_15.q3o('long', getKClass(Long)), Companion_instance_15.q3o('short', PrimitiveClasses_getInstance().h7()), Companion_instance_15.q3o('byte', PrimitiveClasses_getInstance().g7()), Companion_instance_15.q3o('char', getKClass(Char)), Companion_instance_15.q3o('bool', PrimitiveClasses_getInstance().f7()), Companion_instance_15.q3o('boolean', PrimitiveClasses_getInstance().f7()), Companion_instance_15.q3o('any', PrimitiveClasses_getInstance().c7()), Companion_instance_15.q3o('nothing', PrimitiveClasses_getInstance().e7()), Companion_instance_15.q3o('big_integer', getKClass(BigInteger)), Companion_instance_15.q3o('big_decimal', getKClass(BigDecimal))], get_platformSpecificAliases()]));
+    var this_0 = listOf(arrayConcat([[Cast_getInstance_0(), Invocation_getInstance(), Assignment_getInstance(), Dot_getInstance(), Recursive_getInstance(), Couple_getInstance(), Trivial_getInstance(), NewObject2_getInstance(), Recursive_getInstance_0(), Base_getInstance(), Companion_instance_15.h3p('string', PrimitiveClasses_getInstance().m7()), Companion_instance_15.h3p('array', PrimitiveClasses_getInstance().l7()), Companion_instance_15.h3p('list', getKClass(List)), Companion_instance_15.h3p('arraylist', getKClass(ArrayList)), Companion_instance_15.h3p('map', getKClass(Map)), Companion_instance_15.h3p('hashmap', getKClass(LinkedHashMap)), Companion_instance_15.h3p('int', PrimitiveClasses_getInstance().i7()), Companion_instance_15.h3p('integer', PrimitiveClasses_getInstance().i7()), Companion_instance_15.h3p('double', PrimitiveClasses_getInstance().k7()), Companion_instance_15.h3p('float', PrimitiveClasses_getInstance().j7()), Companion_instance_15.h3p('long', getKClass(Long)), Companion_instance_15.h3p('short', PrimitiveClasses_getInstance().h7()), Companion_instance_15.h3p('byte', PrimitiveClasses_getInstance().g7()), Companion_instance_15.h3p('char', getKClass(Char)), Companion_instance_15.h3p('bool', PrimitiveClasses_getInstance().f7()), Companion_instance_15.h3p('boolean', PrimitiveClasses_getInstance().f7()), Companion_instance_15.h3p('any', PrimitiveClasses_getInstance().c7()), Companion_instance_15.h3p('nothing', PrimitiveClasses_getInstance().e7()), Companion_instance_15.h3p('big_integer', getKClass(BigInteger)), Companion_instance_15.h3p('big_decimal', getKClass(BigDecimal))], get_platformSpecificAliases()]));
     // Inline function 'kotlin.collections.mapTo' call
     var destination = ArrayList_init_$Create$(collectionSizeOrDefault(this_0, 10));
     var tmp0_iterator = this_0.r();
     while (tmp0_iterator.s()) {
       var item = tmp0_iterator.u();
       // Inline function 'it.unibo.tuprolog.solve.libs.oop.OOPLib.<get-clauses>.<anonymous>' call
-      var tmp$ret$0 = item.i1u();
+      var tmp$ret$0 = item.q1u();
       destination.o(tmp$ret$0);
     }
     return destination;
   };
-  protoOf(OOPLib).d1v = function () {
+  protoOf(OOPLib).l1v = function () {
     return OperatorSet_init_$Create$([new Operator('.', Specifier_XFY_getInstance(), 800), new Operator(':=', Specifier_XFX_getInstance(), 850), new Operator('as', Specifier_XFX_getInstance(), 200), new Operator('$', Specifier_FX_getInstance(), 100)]);
   };
   var OOPLib_instance;
@@ -309,13 +309,13 @@
   }
   function Companion() {
     Companion_instance_7 = this;
-    this.r3o_1 = NullRefImpl_getInstance();
+    this.i3p_1 = NullRefImpl_getInstance();
   }
-  protoOf(Companion).s3o = function (any) {
+  protoOf(Companion).j3p = function (any) {
     return any == null ? nameOf(this, PrimitiveClasses_getInstance().e7(), 'null') : nameOf(this, getKClassFromExpression(any), get_identifier(any));
   };
-  protoOf(Companion).t3o = function (any) {
-    return any == null ? this.r3o_1 : new ObjectRefImpl(any);
+  protoOf(Companion).k3p = function (any) {
+    return any == null ? this.i3p_1 : new ObjectRefImpl(any);
   };
   var Companion_instance_7;
   function Companion_getInstance_11() {
@@ -327,7 +327,7 @@
   }
   function Companion_0() {
     Companion_instance_8 = this;
-    this.u3o_1 = new ObjectToTermConverterImpl();
+    this.l3p_1 = new ObjectToTermConverterImpl();
   }
   var Companion_instance_8;
   function Companion_getInstance_12() {
@@ -337,7 +337,7 @@
   }
   function Companion_1() {
   }
-  protoOf(Companion_1).v3o = function (type, termToObjectConverter) {
+  protoOf(Companion_1).m3p = function (type, termToObjectConverter) {
     return overloadSelector(type, termToObjectConverter);
   };
   var Companion_instance_9;
@@ -348,19 +348,19 @@
   }
   function _get_termValue__ikgccs($this) {
     // Inline function 'kotlin.getValue' call
-    var this_0 = $this.x3o_1;
+    var this_0 = $this.o3p_1;
     termValue$factory();
     return this_0.r2();
   }
   function _get_objectRef__3zhern($this) {
     // Inline function 'kotlin.getValue' call
-    var this_0 = $this.y3o_1;
+    var this_0 = $this.p3p_1;
     objectRef$factory();
     return this_0.r2();
   }
   function Result$Value$termValue$delegate$lambda(this$0) {
     return function () {
-      return Companion_getInstance_12().u3o_1.z3o(this$0.w3o_1);
+      return Companion_getInstance_12().l3p_1.q3p(this$0.n3p_1);
     };
   }
   function Result$Value$objectRef$delegate$lambda(this$0) {
@@ -373,33 +373,33 @@
       if (isInterface(it, ObjectRef)) {
         tmp = it;
       } else {
-        tmp = Companion_getInstance_11().t3o(this$0.w3o_1);
+        tmp = Companion_getInstance_11().k3p(this$0.n3p_1);
       }
       return tmp;
     };
   }
   function Value(value) {
     Result.call(this);
-    this.w3o_1 = value;
+    this.n3p_1 = value;
     var tmp = this;
-    tmp.x3o_1 = lazy(Result$Value$termValue$delegate$lambda(this));
+    tmp.o3p_1 = lazy(Result$Value$termValue$delegate$lambda(this));
     var tmp_0 = this;
-    tmp_0.y3o_1 = lazy(Result$Value$objectRef$delegate$lambda(this));
+    tmp_0.p3p_1 = lazy(Result$Value$objectRef$delegate$lambda(this));
   }
-  protoOf(Value).t1i = function () {
+  protoOf(Value).p1i = function () {
     return _get_termValue__ikgccs(this);
   };
   protoOf(Value).toTerm = function () {
-    return this.t1i();
+    return this.p1i();
   };
-  protoOf(Value).a3p = function () {
+  protoOf(Value).r3p = function () {
     return _get_objectRef__3zhern(this);
   };
   protoOf(Value).toString = function () {
-    return 'Value(value=' + toString(this.w3o_1) + ')';
+    return 'Value(value=' + toString(this.n3p_1) + ')';
   };
   protoOf(Value).hashCode = function () {
-    return this.w3o_1 == null ? 0 : hashCode(this.w3o_1);
+    return this.n3p_1 == null ? 0 : hashCode(this.n3p_1);
   };
   protoOf(Value).equals = function (other) {
     if (this === other)
@@ -407,7 +407,7 @@
     if (!(other instanceof Value))
       return false;
     var tmp0_other_with_cast = other instanceof Value ? other : THROW_CCE();
-    if (!equals(this.w3o_1, tmp0_other_with_cast.w3o_1))
+    if (!equals(this.n3p_1, tmp0_other_with_cast.n3p_1))
       return false;
     return true;
   };
@@ -428,13 +428,13 @@
   }
   function Companion_2() {
     Companion_instance_10 = this;
-    this.b3p_1 = this.c3p();
+    this.s3p_1 = this.t3p();
   }
-  protoOf(Companion_2).d3p = function (typeFactory, dealiaser) {
+  protoOf(Companion_2).u3p = function (typeFactory, dealiaser) {
     return new TermToObjectConverterImpl(typeFactory, dealiaser);
   };
-  protoOf(Companion_2).c3p = function (typeFactory, dealiaser, $super) {
-    typeFactory = typeFactory === VOID ? Companion_getInstance_15().e3p_1 : typeFactory;
+  protoOf(Companion_2).t3p = function (typeFactory, dealiaser, $super) {
+    typeFactory = typeFactory === VOID ? Companion_getInstance_15().v3p_1 : typeFactory;
     var tmp;
     if (dealiaser === VOID) {
       tmp = TermToObjectConverter$Companion$of$lambda;
@@ -442,7 +442,7 @@
       tmp = dealiaser;
     }
     dealiaser = tmp;
-    return $super === VOID ? this.d3p(typeFactory, dealiaser) : $super.d3p.call(this, typeFactory, dealiaser);
+    return $super === VOID ? this.u3p(typeFactory, dealiaser) : $super.u3p.call(this, typeFactory, dealiaser);
   };
   var Companion_instance_10;
   function Companion_getInstance_14() {
@@ -454,7 +454,7 @@
   }
   function Companion_3() {
     Companion_instance_11 = this;
-    this.e3p_1 = new TypeFactoryImpl();
+    this.v3p_1 = new TypeFactoryImpl();
   }
   var Companion_instance_11;
   function Companion_getInstance_15() {
@@ -463,13 +463,13 @@
     return Companion_instance_11;
   }
   function TypeFactory$typeRefFromName$lambda(it) {
-    return Companion_instance_12.j3p(it);
+    return Companion_instance_12.a3q(it);
   }
   function TypeFactory() {
   }
   function Companion_4() {
   }
-  protoOf(Companion_4).j3p = function (type) {
+  protoOf(Companion_4).a3q = function (type) {
     return new TypeRefImpl(type);
   };
   var Companion_instance_12;
@@ -497,7 +497,7 @@
   }
   function create_0(_this__u8e3s4, objectConverter, arguments_0) {
     _init_properties_TypeUtils_kt__wnsx0l();
-    var constructorRef = Companion_instance_9.v3o(_this__u8e3s4, objectConverter).o3p(arguments_0);
+    var constructorRef = Companion_instance_9.m3p(_this__u8e3s4, objectConverter).f3q(arguments_0);
     return callWithPrologArguments(constructorRef, objectConverter, arguments_0);
   }
   function invoke_0(_this__u8e3s4, objectConverter, methodName, arguments_0) {
@@ -506,7 +506,7 @@
   }
   function invoke_1(_this__u8e3s4, objectConverter, methodName, arguments_0, instance) {
     _init_properties_TypeUtils_kt__wnsx0l();
-    var methodRef = Companion_instance_9.v3o(_this__u8e3s4, objectConverter).p3p(methodName, arguments_0);
+    var methodRef = Companion_instance_9.m3p(_this__u8e3s4, objectConverter).g3q(methodName, arguments_0);
     return callWithPrologArguments(methodRef, objectConverter, arguments_0, instance);
   }
   function assign_0(_this__u8e3s4, objectConverter, propertyName, value) {
@@ -515,7 +515,7 @@
   }
   function assign_1(_this__u8e3s4, objectConverter, propertyName, value, instance) {
     _init_properties_TypeUtils_kt__wnsx0l();
-    var setterRef = get_setterMethod(Companion_instance_9.v3o(_this__u8e3s4, objectConverter).q3p(propertyName, value));
+    var setterRef = get_setterMethod(Companion_instance_9.m3p(_this__u8e3s4, objectConverter).h3q(propertyName, value));
     return callWithPrologArguments(setterRef, objectConverter, listOf_0(value), instance);
   }
   function isSubtypeOf_0(_this__u8e3s4, other, strict) {
@@ -538,7 +538,7 @@
       var tmp1 = index;
       index = tmp1 + 1 | 0;
       var i = checkIndexOverflow(tmp1);
-      var tmp$ret$0 = converter.f3p(formalArgumentsTypes.c1(i), item);
+      var tmp$ret$0 = converter.w3p(formalArgumentsTypes.c1(i), item);
       destination.o(tmp$ret$0);
     }
     var args = copyToArray(destination);
@@ -604,12 +604,12 @@
   function MalformedAliasException(dealiasingExpression) {
     OopException_init_$Init$('This is not a dealiasing expression `' + dealiasingExpression + '` in the form ' + format(get_DEALIASING_TEMPLATE(), Companion_instance_0.prettyExpressionsPrettyVariablesDefaultOperators()), VOID, this);
     captureStack(this, MalformedAliasException);
-    this.r3p_1 = dealiasingExpression;
+    this.i3q_1 = dealiasingExpression;
   }
-  protoOf(MalformedAliasException).s3p = function (context, signature) {
+  protoOf(MalformedAliasException).j3q = function (context, signature) {
     var tmp = Companion_instance_1;
     var tmp_0 = Expected_DEALIASING_EXPRESSION_getInstance();
-    var tmp_1 = this.o25();
+    var tmp_1 = this.w25();
     var tmp_2 = signature.toIndicator();
     var tmp0_safe_receiver = this.message;
     var tmp_3;
@@ -637,24 +637,24 @@
     }
     return tmp.of(context, tmp_0, tmp_1, 'Error in ' + tmp_2 + ': ' + tmp_3);
   };
-  protoOf(MalformedAliasException).o25 = function () {
-    return this.r3p_1;
+  protoOf(MalformedAliasException).w25 = function () {
+    return this.i3q_1;
   };
   function NoSuchAnAliasException(dealiasingExpression) {
     OopException_init_$Init$('There exists no reference whose alias is `' + dealiasingExpression.get(0) + '`', VOID, this);
     captureStack(this, NoSuchAnAliasException);
-    this.t3p_1 = dealiasingExpression;
+    this.k3q_1 = dealiasingExpression;
     // Inline function 'kotlin.require' call
     // Inline function 'kotlin.contracts.contract' call
     // Inline function 'kotlin.require' call
     // Inline function 'kotlin.contracts.contract' call
-    if (!Companion_getInstance().matches(this.t3p_1, get_DEALIASING_TEMPLATE())) {
+    if (!Companion_getInstance().matches(this.k3q_1, get_DEALIASING_TEMPLATE())) {
       // Inline function 'kotlin.require.<anonymous>' call
       var message = 'Failed requirement.';
       throw IllegalArgumentException_init_$Create$(toString_0(message));
     }
     // Inline function 'kotlin.require' call
-    var tmp = this.t3p_1.get(0);
+    var tmp = this.k3q_1.get(0);
     // Inline function 'kotlin.contracts.contract' call
     // Inline function 'kotlin.require' call
     // Inline function 'kotlin.contracts.contract' call
@@ -664,15 +664,15 @@
       throw IllegalArgumentException_init_$Create$(toString_0(message_0));
     }
   }
-  protoOf(NoSuchAnAliasException).s3p = function (context, signature) {
+  protoOf(NoSuchAnAliasException).j3q = function (context, signature) {
     var tmp = Companion_instance_2;
     var tmp_0 = ObjectType_OOP_ALIAS_getInstance();
-    var tmp_1 = this.o25();
+    var tmp_1 = this.w25();
     var tmp0_elvis_lhs = this.message;
     return tmp.of(context, tmp_0, tmp_1, tmp0_elvis_lhs == null ? '' : tmp0_elvis_lhs);
   };
-  protoOf(NoSuchAnAliasException).o25 = function () {
-    return this.t3p_1;
+  protoOf(NoSuchAnAliasException).w25 = function () {
+    return this.k3q_1;
   };
   function OopException_init_$Init$(message, cause, $this) {
     message = message === VOID ? null : message;
@@ -713,285 +713,285 @@
     var tmp1_elvis_lhs = tmp;
     OopException_init_$Init$(tmp1_elvis_lhs == null ? 'Term `' + term + '` cannot be converted into an object' : tmp1_elvis_lhs, VOID, this);
     captureStack(this, TermToObjectConversionException);
-    this.u3p_1 = term;
-    this.v3p_1 = targetType;
+    this.l3q_1 = term;
+    this.m3q_1 = targetType;
   }
-  protoOf(TermToObjectConversionException).s3p = function (context, signature) {
-    return Companion_instance_3.h27(context, signature, Limit_OOP_OBJECT_getInstance(), this);
+  protoOf(TermToObjectConversionException).j3q = function (context, signature) {
+    return Companion_instance_3.p27(context, signature, Limit_OOP_OBJECT_getInstance(), this);
   };
   function NullRefImpl() {
     NullRefImpl_instance = this;
-    this.w3p_1 = Companion_getInstance_0().of(Companion_getInstance_11().s3o(null));
+    this.n3q_1 = Companion_getInstance_0().of(Companion_getInstance_11().j3p(null));
   }
   protoOf(NullRefImpl).rw = function () {
-    return this.w3p_1.rw();
+    return this.n3q_1.rw();
   };
   protoOf(NullRefImpl).jx = function () {
-    return this.w3p_1.jx();
+    return this.n3q_1.jx();
   };
   protoOf(NullRefImpl).kw = function () {
-    return this.w3p_1.kw();
+    return this.n3q_1.kw();
   };
   protoOf(NullRefImpl).qw = function () {
-    return this.w3p_1.qw();
+    return this.n3q_1.qw();
   };
   protoOf(NullRefImpl).ix = function () {
-    return this.w3p_1.ix();
+    return this.n3q_1.ix();
   };
   protoOf(NullRefImpl).lw = function () {
-    return this.w3p_1.lw();
+    return this.n3q_1.lw();
   };
   protoOf(NullRefImpl).xw = function () {
-    return this.w3p_1.xw();
+    return this.n3q_1.xw();
   };
   protoOf(NullRefImpl).dx = function () {
-    return this.w3p_1.dx();
+    return this.n3q_1.dx();
   };
   protoOf(NullRefImpl).mw = function () {
-    return this.w3p_1.mw();
+    return this.n3q_1.mw();
   };
   protoOf(NullRefImpl).nw = function () {
-    return this.w3p_1.nw();
+    return this.n3q_1.nw();
   };
   protoOf(NullRefImpl).hx = function () {
-    return this.w3p_1.hx();
+    return this.n3q_1.hx();
   };
   protoOf(NullRefImpl).ux = function () {
-    return this.w3p_1.ux();
+    return this.n3q_1.ux();
   };
   protoOf(NullRefImpl).fx = function () {
-    return this.w3p_1.fx();
+    return this.n3q_1.fx();
   };
   protoOf(NullRefImpl).rx = function () {
-    return this.w3p_1.rx();
+    return this.n3q_1.rx();
   };
   protoOf(NullRefImpl).cx = function () {
-    return this.w3p_1.cx();
+    return this.n3q_1.cx();
   };
   protoOf(NullRefImpl).qx = function () {
-    return this.w3p_1.qx();
+    return this.n3q_1.qx();
   };
   protoOf(NullRefImpl).sx = function () {
-    return this.w3p_1.sx();
+    return this.n3q_1.sx();
   };
   protoOf(NullRefImpl).ox = function () {
-    return this.w3p_1.ox();
+    return this.n3q_1.ox();
   };
   protoOf(NullRefImpl).yw = function () {
-    return this.w3p_1.yw();
+    return this.n3q_1.yw();
   };
   protoOf(NullRefImpl).ww = function () {
-    return this.w3p_1.ww();
+    return this.n3q_1.ww();
   };
   protoOf(NullRefImpl).ow = function () {
-    return this.w3p_1.ow();
+    return this.n3q_1.ow();
   };
   protoOf(NullRefImpl).nx = function () {
-    return this.w3p_1.nx();
+    return this.n3q_1.nx();
   };
   protoOf(NullRefImpl).bx = function () {
-    return this.w3p_1.bx();
+    return this.n3q_1.bx();
   };
   protoOf(NullRefImpl).mx = function () {
-    return this.w3p_1.mx();
+    return this.n3q_1.mx();
   };
   protoOf(NullRefImpl).vt = function () {
-    return this.w3p_1.vt();
+    return this.n3q_1.vt();
   };
   protoOf(NullRefImpl).r2 = function () {
-    return this.w3p_1.r2();
+    return this.n3q_1.r2();
   };
   protoOf(NullRefImpl).sw = function () {
-    return this.w3p_1.sw();
+    return this.n3q_1.sw();
   };
   protoOf(NullRefImpl).addFirst = function (argument) {
-    return this.w3p_1.addFirst(argument);
+    return this.n3q_1.addFirst(argument);
   };
   protoOf(NullRefImpl).addLast = function (argument) {
-    return this.w3p_1.addLast(argument);
+    return this.n3q_1.addLast(argument);
   };
   protoOf(NullRefImpl).append = function (argument) {
-    return this.w3p_1.append(argument);
+    return this.n3q_1.append(argument);
   };
   protoOf(NullRefImpl).vw = function () {
-    return this.w3p_1.vw();
+    return this.n3q_1.vw();
   };
   protoOf(NullRefImpl).asAtom = function () {
     return this.vw();
   };
   protoOf(NullRefImpl).asBlock = function () {
-    return this.w3p_1.asBlock();
+    return this.n3q_1.asBlock();
   };
   protoOf(NullRefImpl).asClause = function () {
-    return this.w3p_1.asClause();
+    return this.n3q_1.asClause();
   };
   protoOf(NullRefImpl).asCons = function () {
-    return this.w3p_1.asCons();
+    return this.n3q_1.asCons();
   };
   protoOf(NullRefImpl).asDirective = function () {
-    return this.w3p_1.asDirective();
+    return this.n3q_1.asDirective();
   };
   protoOf(NullRefImpl).asEmptyBlock = function () {
-    return this.w3p_1.asEmptyBlock();
+    return this.n3q_1.asEmptyBlock();
   };
   protoOf(NullRefImpl).asEmptyList = function () {
-    return this.w3p_1.asEmptyList();
+    return this.n3q_1.asEmptyList();
   };
   protoOf(NullRefImpl).asFact = function () {
-    return this.w3p_1.asFact();
+    return this.n3q_1.asFact();
   };
   protoOf(NullRefImpl).asIndicator = function () {
-    return this.w3p_1.asIndicator();
+    return this.n3q_1.asIndicator();
   };
   protoOf(NullRefImpl).asInteger = function () {
-    return this.w3p_1.asInteger();
+    return this.n3q_1.asInteger();
   };
   protoOf(NullRefImpl).asList = function () {
-    return this.w3p_1.asList();
+    return this.n3q_1.asList();
   };
   protoOf(NullRefImpl).asNumeric = function () {
-    return this.w3p_1.asNumeric();
+    return this.n3q_1.asNumeric();
   };
   protoOf(NullRefImpl).asReal = function () {
-    return this.w3p_1.asReal();
+    return this.n3q_1.asReal();
   };
   protoOf(NullRefImpl).asRecursive = function () {
-    return this.w3p_1.asRecursive();
+    return this.n3q_1.asRecursive();
   };
   protoOf(NullRefImpl).asRule = function () {
-    return this.w3p_1.asRule();
+    return this.n3q_1.asRule();
   };
   protoOf(NullRefImpl).gx = function () {
-    return this.w3p_1.gx();
+    return this.n3q_1.gx();
   };
   protoOf(NullRefImpl).asStruct = function () {
     return this.gx();
   };
   protoOf(NullRefImpl).asTerm = function () {
-    return this.w3p_1.asTerm();
+    return this.n3q_1.asTerm();
   };
   protoOf(NullRefImpl).asTruth = function () {
-    return this.w3p_1.asTruth();
+    return this.n3q_1.asTruth();
   };
   protoOf(NullRefImpl).asTuple = function () {
-    return this.w3p_1.asTuple();
+    return this.n3q_1.asTuple();
   };
   protoOf(NullRefImpl).asVar = function () {
-    return this.w3p_1.asVar();
+    return this.n3q_1.asVar();
   };
   protoOf(NullRefImpl).castToAtom = function () {
-    return this.w3p_1.castToAtom();
+    return this.n3q_1.castToAtom();
   };
   protoOf(NullRefImpl).castToBlock = function () {
-    return this.w3p_1.castToBlock();
+    return this.n3q_1.castToBlock();
   };
   protoOf(NullRefImpl).castToClause = function () {
-    return this.w3p_1.castToClause();
+    return this.n3q_1.castToClause();
   };
   protoOf(NullRefImpl).castToCons = function () {
-    return this.w3p_1.castToCons();
+    return this.n3q_1.castToCons();
   };
   protoOf(NullRefImpl).castToConstant = function () {
-    return this.w3p_1.castToConstant();
+    return this.n3q_1.castToConstant();
   };
   protoOf(NullRefImpl).castToDirective = function () {
-    return this.w3p_1.castToDirective();
+    return this.n3q_1.castToDirective();
   };
   protoOf(NullRefImpl).castToEmptyBlock = function () {
-    return this.w3p_1.castToEmptyBlock();
+    return this.n3q_1.castToEmptyBlock();
   };
   protoOf(NullRefImpl).castToEmptyList = function () {
-    return this.w3p_1.castToEmptyList();
+    return this.n3q_1.castToEmptyList();
   };
   protoOf(NullRefImpl).castToFact = function () {
-    return this.w3p_1.castToFact();
+    return this.n3q_1.castToFact();
   };
   protoOf(NullRefImpl).castToIndicator = function () {
-    return this.w3p_1.castToIndicator();
+    return this.n3q_1.castToIndicator();
   };
   protoOf(NullRefImpl).castToInteger = function () {
-    return this.w3p_1.castToInteger();
+    return this.n3q_1.castToInteger();
   };
   protoOf(NullRefImpl).castToList = function () {
-    return this.w3p_1.castToList();
+    return this.n3q_1.castToList();
   };
   protoOf(NullRefImpl).castToNumeric = function () {
-    return this.w3p_1.castToNumeric();
+    return this.n3q_1.castToNumeric();
   };
   protoOf(NullRefImpl).castToReal = function () {
-    return this.w3p_1.castToReal();
+    return this.n3q_1.castToReal();
   };
   protoOf(NullRefImpl).castToRecursive = function () {
-    return this.w3p_1.castToRecursive();
+    return this.n3q_1.castToRecursive();
   };
   protoOf(NullRefImpl).castToRule = function () {
-    return this.w3p_1.castToRule();
+    return this.n3q_1.castToRule();
   };
   protoOf(NullRefImpl).castToStruct = function () {
-    return this.w3p_1.castToStruct();
+    return this.n3q_1.castToStruct();
   };
   protoOf(NullRefImpl).castToTerm = function () {
-    return this.w3p_1.castToTerm();
+    return this.n3q_1.castToTerm();
   };
   protoOf(NullRefImpl).castToTruth = function () {
-    return this.w3p_1.castToTruth();
+    return this.n3q_1.castToTruth();
   };
   protoOf(NullRefImpl).castToTuple = function () {
-    return this.w3p_1.castToTuple();
+    return this.n3q_1.castToTuple();
   };
   protoOf(NullRefImpl).castToVar = function () {
-    return this.w3p_1.castToVar();
+    return this.n3q_1.castToVar();
   };
   protoOf(NullRefImpl).lx = function (other) {
-    return this.w3p_1.lx(other);
+    return this.n3q_1.lx(other);
   };
   protoOf(NullRefImpl).d = function (other) {
     return this.lx((!(other == null) ? isInterface(other, Term) : false) ? other : THROW_CCE());
   };
   protoOf(NullRefImpl).containsTag = function (name) {
-    return this.w3p_1.containsTag(name);
+    return this.n3q_1.containsTag(name);
   };
   protoOf(NullRefImpl).equalsUsingVarCompleteNames = function (other, useVarCompleteName) {
-    return this.w3p_1.equalsUsingVarCompleteNames(other, useVarCompleteName);
+    return this.n3q_1.equalsUsingVarCompleteNames(other, useVarCompleteName);
   };
   protoOf(NullRefImpl).equals = function (other) {
-    return this.w3p_1.equals(other);
+    return this.n3q_1.equals(other);
   };
   protoOf(NullRefImpl).get = function (index) {
-    return this.w3p_1.get(index);
+    return this.n3q_1.get(index);
   };
   protoOf(NullRefImpl).getArgAt = function (index) {
-    return this.w3p_1.getArgAt(index);
+    return this.n3q_1.getArgAt(index);
   };
   protoOf(NullRefImpl).getTag = function (name) {
-    return this.w3p_1.getTag(name);
+    return this.n3q_1.getTag(name);
   };
   protoOf(NullRefImpl).hashCode = function () {
-    return this.w3p_1.hashCode();
+    return this.n3q_1.hashCode();
   };
   protoOf(NullRefImpl).insertAt = function (index, argument) {
-    return this.w3p_1.insertAt(index, argument);
+    return this.n3q_1.insertAt(index, argument);
   };
   protoOf(NullRefImpl).resetTags = function (tags) {
-    return this.w3p_1.resetTags(tags);
+    return this.n3q_1.resetTags(tags);
   };
   protoOf(NullRefImpl).setArgs = function (args) {
-    return this.w3p_1.setArgs(args);
+    return this.n3q_1.setArgs(args);
   };
   protoOf(NullRefImpl).setArgsIterable = function (args) {
-    return this.w3p_1.setArgsIterable(args);
+    return this.n3q_1.setArgsIterable(args);
   };
   protoOf(NullRefImpl).setArgsSequence = function (args) {
-    return this.w3p_1.setArgsSequence(args);
+    return this.n3q_1.setArgsSequence(args);
   };
   protoOf(NullRefImpl).setFunctor = function (functor) {
-    return this.w3p_1.setFunctor(functor);
+    return this.n3q_1.setFunctor(functor);
   };
   protoOf(NullRefImpl).structurallyEquals = function (other) {
-    return this.w3p_1.structurallyEquals(other);
+    return this.n3q_1.structurallyEquals(other);
   };
   protoOf(NullRefImpl).toString = function () {
-    return this.w3p_1.toString();
+    return this.n3q_1.toString();
   };
   protoOf(NullRefImpl).px = function () {
     return true;
@@ -1026,17 +1026,17 @@
   protoOf(NullRefImpl).applySubstitution = function (substitution) {
     return this.w16(substitution);
   };
-  protoOf(NullRefImpl).b2o = function (substitution, substitutions) {
+  protoOf(NullRefImpl).s2o = function (substitution, substitutions) {
     return this;
   };
   protoOf(NullRefImpl).apply = function (substitution, substitutions) {
-    return this.b2o(substitution, substitutions);
+    return this.s2o(substitution, substitutions);
   };
-  protoOf(NullRefImpl).a2o = function (substitution, substitutions) {
+  protoOf(NullRefImpl).r2o = function (substitution, substitutions) {
     return this;
   };
   protoOf(NullRefImpl).getSubstituted = function (substitution, substitutions) {
-    return this.a2o(substitution, substitutions);
+    return this.r2o(substitution, substitutions);
   };
   protoOf(NullRefImpl).c16 = function (visitor) {
     return visitor.visitAtom(this);
@@ -1051,281 +1051,281 @@
     return NullRefImpl_instance;
   }
   function ObjectRefImpl(object) {
-    this.x3p_1 = object;
-    this.y3p_1 = Companion_getInstance_0().of(Companion_getInstance_11().s3o(object));
+    this.o3q_1 = object;
+    this.p3q_1 = Companion_getInstance_0().of(Companion_getInstance_11().j3p(object));
   }
-  protoOf(ObjectRefImpl).g3o = function () {
-    return this.x3p_1;
+  protoOf(ObjectRefImpl).x3o = function () {
+    return this.o3q_1;
   };
   protoOf(ObjectRefImpl).rw = function () {
-    return this.y3p_1.rw();
+    return this.p3q_1.rw();
   };
   protoOf(ObjectRefImpl).jx = function () {
-    return this.y3p_1.jx();
+    return this.p3q_1.jx();
   };
   protoOf(ObjectRefImpl).kw = function () {
-    return this.y3p_1.kw();
+    return this.p3q_1.kw();
   };
   protoOf(ObjectRefImpl).qw = function () {
-    return this.y3p_1.qw();
+    return this.p3q_1.qw();
   };
   protoOf(ObjectRefImpl).ix = function () {
-    return this.y3p_1.ix();
+    return this.p3q_1.ix();
   };
   protoOf(ObjectRefImpl).lw = function () {
-    return this.y3p_1.lw();
+    return this.p3q_1.lw();
   };
   protoOf(ObjectRefImpl).xw = function () {
-    return this.y3p_1.xw();
+    return this.p3q_1.xw();
   };
   protoOf(ObjectRefImpl).dx = function () {
-    return this.y3p_1.dx();
+    return this.p3q_1.dx();
   };
   protoOf(ObjectRefImpl).mw = function () {
-    return this.y3p_1.mw();
+    return this.p3q_1.mw();
   };
   protoOf(ObjectRefImpl).nw = function () {
-    return this.y3p_1.nw();
+    return this.p3q_1.nw();
   };
   protoOf(ObjectRefImpl).hx = function () {
-    return this.y3p_1.hx();
+    return this.p3q_1.hx();
   };
   protoOf(ObjectRefImpl).ux = function () {
-    return this.y3p_1.ux();
+    return this.p3q_1.ux();
   };
   protoOf(ObjectRefImpl).fx = function () {
-    return this.y3p_1.fx();
+    return this.p3q_1.fx();
   };
   protoOf(ObjectRefImpl).rx = function () {
-    return this.y3p_1.rx();
+    return this.p3q_1.rx();
   };
   protoOf(ObjectRefImpl).cx = function () {
-    return this.y3p_1.cx();
+    return this.p3q_1.cx();
   };
   protoOf(ObjectRefImpl).qx = function () {
-    return this.y3p_1.qx();
+    return this.p3q_1.qx();
   };
   protoOf(ObjectRefImpl).sx = function () {
-    return this.y3p_1.sx();
+    return this.p3q_1.sx();
   };
   protoOf(ObjectRefImpl).ox = function () {
-    return this.y3p_1.ox();
+    return this.p3q_1.ox();
   };
   protoOf(ObjectRefImpl).yw = function () {
-    return this.y3p_1.yw();
+    return this.p3q_1.yw();
   };
   protoOf(ObjectRefImpl).ww = function () {
-    return this.y3p_1.ww();
+    return this.p3q_1.ww();
   };
   protoOf(ObjectRefImpl).ow = function () {
-    return this.y3p_1.ow();
+    return this.p3q_1.ow();
   };
   protoOf(ObjectRefImpl).nx = function () {
-    return this.y3p_1.nx();
+    return this.p3q_1.nx();
   };
   protoOf(ObjectRefImpl).bx = function () {
-    return this.y3p_1.bx();
+    return this.p3q_1.bx();
   };
   protoOf(ObjectRefImpl).mx = function () {
-    return this.y3p_1.mx();
+    return this.p3q_1.mx();
   };
   protoOf(ObjectRefImpl).vt = function () {
-    return this.y3p_1.vt();
+    return this.p3q_1.vt();
   };
   protoOf(ObjectRefImpl).r2 = function () {
-    return this.y3p_1.r2();
+    return this.p3q_1.r2();
   };
   protoOf(ObjectRefImpl).sw = function () {
-    return this.y3p_1.sw();
+    return this.p3q_1.sw();
   };
   protoOf(ObjectRefImpl).addFirst = function (argument) {
-    return this.y3p_1.addFirst(argument);
+    return this.p3q_1.addFirst(argument);
   };
   protoOf(ObjectRefImpl).addLast = function (argument) {
-    return this.y3p_1.addLast(argument);
+    return this.p3q_1.addLast(argument);
   };
   protoOf(ObjectRefImpl).append = function (argument) {
-    return this.y3p_1.append(argument);
+    return this.p3q_1.append(argument);
   };
   protoOf(ObjectRefImpl).vw = function () {
-    return this.y3p_1.vw();
+    return this.p3q_1.vw();
   };
   protoOf(ObjectRefImpl).asAtom = function () {
     return this.vw();
   };
   protoOf(ObjectRefImpl).asBlock = function () {
-    return this.y3p_1.asBlock();
+    return this.p3q_1.asBlock();
   };
   protoOf(ObjectRefImpl).asClause = function () {
-    return this.y3p_1.asClause();
+    return this.p3q_1.asClause();
   };
   protoOf(ObjectRefImpl).asCons = function () {
-    return this.y3p_1.asCons();
+    return this.p3q_1.asCons();
   };
   protoOf(ObjectRefImpl).asDirective = function () {
-    return this.y3p_1.asDirective();
+    return this.p3q_1.asDirective();
   };
   protoOf(ObjectRefImpl).asEmptyBlock = function () {
-    return this.y3p_1.asEmptyBlock();
+    return this.p3q_1.asEmptyBlock();
   };
   protoOf(ObjectRefImpl).asEmptyList = function () {
-    return this.y3p_1.asEmptyList();
+    return this.p3q_1.asEmptyList();
   };
   protoOf(ObjectRefImpl).asFact = function () {
-    return this.y3p_1.asFact();
+    return this.p3q_1.asFact();
   };
   protoOf(ObjectRefImpl).asIndicator = function () {
-    return this.y3p_1.asIndicator();
+    return this.p3q_1.asIndicator();
   };
   protoOf(ObjectRefImpl).asInteger = function () {
-    return this.y3p_1.asInteger();
+    return this.p3q_1.asInteger();
   };
   protoOf(ObjectRefImpl).asList = function () {
-    return this.y3p_1.asList();
+    return this.p3q_1.asList();
   };
   protoOf(ObjectRefImpl).asNumeric = function () {
-    return this.y3p_1.asNumeric();
+    return this.p3q_1.asNumeric();
   };
   protoOf(ObjectRefImpl).asReal = function () {
-    return this.y3p_1.asReal();
+    return this.p3q_1.asReal();
   };
   protoOf(ObjectRefImpl).asRecursive = function () {
-    return this.y3p_1.asRecursive();
+    return this.p3q_1.asRecursive();
   };
   protoOf(ObjectRefImpl).asRule = function () {
-    return this.y3p_1.asRule();
+    return this.p3q_1.asRule();
   };
   protoOf(ObjectRefImpl).gx = function () {
-    return this.y3p_1.gx();
+    return this.p3q_1.gx();
   };
   protoOf(ObjectRefImpl).asStruct = function () {
     return this.gx();
   };
   protoOf(ObjectRefImpl).asTerm = function () {
-    return this.y3p_1.asTerm();
+    return this.p3q_1.asTerm();
   };
   protoOf(ObjectRefImpl).asTruth = function () {
-    return this.y3p_1.asTruth();
+    return this.p3q_1.asTruth();
   };
   protoOf(ObjectRefImpl).asTuple = function () {
-    return this.y3p_1.asTuple();
+    return this.p3q_1.asTuple();
   };
   protoOf(ObjectRefImpl).asVar = function () {
-    return this.y3p_1.asVar();
+    return this.p3q_1.asVar();
   };
   protoOf(ObjectRefImpl).castToAtom = function () {
-    return this.y3p_1.castToAtom();
+    return this.p3q_1.castToAtom();
   };
   protoOf(ObjectRefImpl).castToBlock = function () {
-    return this.y3p_1.castToBlock();
+    return this.p3q_1.castToBlock();
   };
   protoOf(ObjectRefImpl).castToClause = function () {
-    return this.y3p_1.castToClause();
+    return this.p3q_1.castToClause();
   };
   protoOf(ObjectRefImpl).castToCons = function () {
-    return this.y3p_1.castToCons();
+    return this.p3q_1.castToCons();
   };
   protoOf(ObjectRefImpl).castToConstant = function () {
-    return this.y3p_1.castToConstant();
+    return this.p3q_1.castToConstant();
   };
   protoOf(ObjectRefImpl).castToDirective = function () {
-    return this.y3p_1.castToDirective();
+    return this.p3q_1.castToDirective();
   };
   protoOf(ObjectRefImpl).castToEmptyBlock = function () {
-    return this.y3p_1.castToEmptyBlock();
+    return this.p3q_1.castToEmptyBlock();
   };
   protoOf(ObjectRefImpl).castToEmptyList = function () {
-    return this.y3p_1.castToEmptyList();
+    return this.p3q_1.castToEmptyList();
   };
   protoOf(ObjectRefImpl).castToFact = function () {
-    return this.y3p_1.castToFact();
+    return this.p3q_1.castToFact();
   };
   protoOf(ObjectRefImpl).castToIndicator = function () {
-    return this.y3p_1.castToIndicator();
+    return this.p3q_1.castToIndicator();
   };
   protoOf(ObjectRefImpl).castToInteger = function () {
-    return this.y3p_1.castToInteger();
+    return this.p3q_1.castToInteger();
   };
   protoOf(ObjectRefImpl).castToList = function () {
-    return this.y3p_1.castToList();
+    return this.p3q_1.castToList();
   };
   protoOf(ObjectRefImpl).castToNumeric = function () {
-    return this.y3p_1.castToNumeric();
+    return this.p3q_1.castToNumeric();
   };
   protoOf(ObjectRefImpl).castToReal = function () {
-    return this.y3p_1.castToReal();
+    return this.p3q_1.castToReal();
   };
   protoOf(ObjectRefImpl).castToRecursive = function () {
-    return this.y3p_1.castToRecursive();
+    return this.p3q_1.castToRecursive();
   };
   protoOf(ObjectRefImpl).castToRule = function () {
-    return this.y3p_1.castToRule();
+    return this.p3q_1.castToRule();
   };
   protoOf(ObjectRefImpl).castToStruct = function () {
-    return this.y3p_1.castToStruct();
+    return this.p3q_1.castToStruct();
   };
   protoOf(ObjectRefImpl).castToTerm = function () {
-    return this.y3p_1.castToTerm();
+    return this.p3q_1.castToTerm();
   };
   protoOf(ObjectRefImpl).castToTruth = function () {
-    return this.y3p_1.castToTruth();
+    return this.p3q_1.castToTruth();
   };
   protoOf(ObjectRefImpl).castToTuple = function () {
-    return this.y3p_1.castToTuple();
+    return this.p3q_1.castToTuple();
   };
   protoOf(ObjectRefImpl).castToVar = function () {
-    return this.y3p_1.castToVar();
+    return this.p3q_1.castToVar();
   };
   protoOf(ObjectRefImpl).lx = function (other) {
-    return this.y3p_1.lx(other);
+    return this.p3q_1.lx(other);
   };
   protoOf(ObjectRefImpl).d = function (other) {
     return this.lx((!(other == null) ? isInterface(other, Term) : false) ? other : THROW_CCE());
   };
   protoOf(ObjectRefImpl).containsTag = function (name) {
-    return this.y3p_1.containsTag(name);
+    return this.p3q_1.containsTag(name);
   };
   protoOf(ObjectRefImpl).equalsUsingVarCompleteNames = function (other, useVarCompleteName) {
-    return this.y3p_1.equalsUsingVarCompleteNames(other, useVarCompleteName);
+    return this.p3q_1.equalsUsingVarCompleteNames(other, useVarCompleteName);
   };
   protoOf(ObjectRefImpl).equals = function (other) {
-    return this.y3p_1.equals(other);
+    return this.p3q_1.equals(other);
   };
   protoOf(ObjectRefImpl).get = function (index) {
-    return this.y3p_1.get(index);
+    return this.p3q_1.get(index);
   };
   protoOf(ObjectRefImpl).getArgAt = function (index) {
-    return this.y3p_1.getArgAt(index);
+    return this.p3q_1.getArgAt(index);
   };
   protoOf(ObjectRefImpl).getTag = function (name) {
-    return this.y3p_1.getTag(name);
+    return this.p3q_1.getTag(name);
   };
   protoOf(ObjectRefImpl).hashCode = function () {
-    return this.y3p_1.hashCode();
+    return this.p3q_1.hashCode();
   };
   protoOf(ObjectRefImpl).insertAt = function (index, argument) {
-    return this.y3p_1.insertAt(index, argument);
+    return this.p3q_1.insertAt(index, argument);
   };
   protoOf(ObjectRefImpl).resetTags = function (tags) {
-    return this.y3p_1.resetTags(tags);
+    return this.p3q_1.resetTags(tags);
   };
   protoOf(ObjectRefImpl).setArgs = function (args) {
-    return this.y3p_1.setArgs(args);
+    return this.p3q_1.setArgs(args);
   };
   protoOf(ObjectRefImpl).setArgsIterable = function (args) {
-    return this.y3p_1.setArgsIterable(args);
+    return this.p3q_1.setArgsIterable(args);
   };
   protoOf(ObjectRefImpl).setArgsSequence = function (args) {
-    return this.y3p_1.setArgsSequence(args);
+    return this.p3q_1.setArgsSequence(args);
   };
   protoOf(ObjectRefImpl).setFunctor = function (functor) {
-    return this.y3p_1.setFunctor(functor);
+    return this.p3q_1.setFunctor(functor);
   };
   protoOf(ObjectRefImpl).structurallyEquals = function (other) {
-    return this.y3p_1.structurallyEquals(other);
+    return this.p3q_1.structurallyEquals(other);
   };
   protoOf(ObjectRefImpl).toString = function () {
-    return this.y3p_1.toString();
+    return this.p3q_1.toString();
   };
   protoOf(ObjectRefImpl).px = function () {
     return true;
@@ -1336,11 +1336,11 @@
   protoOf(ObjectRefImpl).asConstant = function () {
     return this.tx();
   };
-  protoOf(ObjectRefImpl).h3o = function (objectConverter, methodName, arguments_0) {
-    return invoke_0(this.x3p_1, objectConverter, methodName, arguments_0);
+  protoOf(ObjectRefImpl).y3o = function (objectConverter, methodName, arguments_0) {
+    return invoke_0(this.o3q_1, objectConverter, methodName, arguments_0);
   };
-  protoOf(ObjectRefImpl).i3o = function (objectConverter, propertyName, value) {
-    assign_0(this.x3p_1, objectConverter, propertyName, value);
+  protoOf(ObjectRefImpl).z3o = function (objectConverter, propertyName, value) {
+    assign_0(this.o3q_1, objectConverter, propertyName, value);
     return true;
   };
   protoOf(ObjectRefImpl).tw = function () {
@@ -1367,17 +1367,17 @@
   protoOf(ObjectRefImpl).applySubstitution = function (substitution) {
     return this.w16(substitution);
   };
-  protoOf(ObjectRefImpl).b2o = function (substitution, substitutions) {
+  protoOf(ObjectRefImpl).s2o = function (substitution, substitutions) {
     return this;
   };
   protoOf(ObjectRefImpl).apply = function (substitution, substitutions) {
-    return this.b2o(substitution, substitutions);
+    return this.s2o(substitution, substitutions);
   };
-  protoOf(ObjectRefImpl).a2o = function (substitution, substitutions) {
+  protoOf(ObjectRefImpl).r2o = function (substitution, substitutions) {
     return this;
   };
   protoOf(ObjectRefImpl).getSubstituted = function (substitution, substitutions) {
-    return this.a2o(substitution, substitutions);
+    return this.r2o(substitution, substitutions);
   };
   protoOf(ObjectRefImpl).c16 = function (visitor) {
     return visitor.visitAtom(this);
@@ -1386,16 +1386,16 @@
     return this.c16(visitor);
   };
   function ObjectToTermConverterImpl() {
-    this.z3p_1 = new NumberTypeTester();
+    this.q3q_1 = new NumberTypeTester();
   }
-  protoOf(ObjectToTermConverterImpl).z3o = function (source) {
+  protoOf(ObjectToTermConverterImpl).q3p = function (source) {
     // Inline function 'kotlin.with' call
     // Inline function 'kotlin.contracts.contract' call
     // Inline function 'it.unibo.tuprolog.solve.libs.oop.impl.ObjectToTermConverterImpl.convert.<anonymous>' call
-    var $this$with = this.z3p_1;
+    var $this$with = this.q3q_1;
     var tmp;
     if (source == null) {
-      tmp = Companion_getInstance_11().r3o_1;
+      tmp = Companion_getInstance_11().i3p_1;
     } else {
       if (!(source == null) ? typeof source === 'string' : false) {
         tmp = Companion_getInstance_0().of(source);
@@ -1412,7 +1412,7 @@
             if (!(source == null) ? typeof source === 'boolean' : false) {
               tmp = Companion_getInstance_1().of(source);
             } else {
-              tmp = Companion_getInstance_11().t3o(source);
+              tmp = Companion_getInstance_11().k3p(source);
             }
           }
         }
@@ -1423,7 +1423,7 @@
   function explicitConversion($this, castExpression, term, type) {
     var targetType = getType($this, castExpression, type);
     try {
-      return $this.f3p(targetType, term);
+      return $this.w3p(targetType, term);
     } catch ($p) {
       if ($p instanceof TermToObjectConversionException) {
         var e = $p;
@@ -1441,10 +1441,10 @@
   function getType($this, castExpression, typeTerm) {
     var tmp;
     if (isInterface(typeTerm, TypeRef)) {
-      tmp = typeTerm.r24();
+      tmp = typeTerm.z24();
     } else {
       if (isInterface(typeTerm, Atom)) {
-        var tmp1_elvis_lhs = $this.a3q_1.k3p(typeTerm.r2());
+        var tmp1_elvis_lhs = $this.r3q_1.b3q(typeTerm.r2());
         var tmp_0;
         if (tmp1_elvis_lhs == null) {
           throw TermToObjectConversionException_init_$Create$(castExpression);
@@ -1456,10 +1456,10 @@
         if (isInterface(typeTerm, Struct)) {
           var tmp_1;
           if (Companion_getInstance().matches(typeTerm, get_DEALIASING_TEMPLATE())) {
-            var ref = $this.b3q_1(typeTerm);
+            var ref = $this.s3q_1(typeTerm);
             var tmp_2;
             if (!(ref == null) ? isInterface(ref, TypeRef) : false) {
-              tmp_2 = ref.r24();
+              tmp_2 = ref.z24();
             } else {
               throw TermToObjectConversionException_init_$Create$(castExpression);
             }
@@ -1487,7 +1487,7 @@
       tmp = sequenceOf([PrimitiveClasses_getInstance().e7()]);
     } else {
       if (isInterface(term, ObjectRef)) {
-        tmp = sequenceOf([getKClassFromExpression(term.g3o())]);
+        tmp = sequenceOf([getKClassFromExpression(term.x3o())]);
       } else {
         if (isInterface(term, Truth)) {
           tmp = sequenceOf([PrimitiveClasses_getInstance().f7(), PrimitiveClasses_getInstance().m7()]);
@@ -1545,7 +1545,7 @@
                   if (Companion_getInstance().matches(term, get_CAST_TEMPLATE())) {
                     tmp_8 = sequenceOf([getType($this, term, term.get(1))]);
                   } else if (Companion_getInstance().matches(term, get_DEALIASING_TEMPLATE())) {
-                    var ref = $this.b3q_1(term);
+                    var ref = $this.s3q_1(term);
                     var tmp_9;
                     if (!(ref == null) ? isInterface(ref, ObjectRef) : false) {
                       tmp_9 = admissibleTypesByPriority($this, ref);
@@ -1569,10 +1569,10 @@
     return tmp;
   }
   function TermToObjectConverterImpl(typeFactory, dealiaser) {
-    this.a3q_1 = typeFactory;
-    this.b3q_1 = dealiaser;
+    this.r3q_1 = typeFactory;
+    this.s3q_1 = dealiaser;
   }
-  protoOf(TermToObjectConverterImpl).f3p = function (type, term) {
+  protoOf(TermToObjectConverterImpl).w3p = function (type, term) {
     var tmp;
     var tmp_0;
     if (isInterface(term, NullRef)) {
@@ -1591,8 +1591,8 @@
     } else {
       if (isInterface(term, ObjectRef)) {
         var tmp_2;
-        if (isSubtypeOf(getKClassFromExpression(term.g3o()), type)) {
-          tmp_2 = term.g3o();
+        if (isSubtypeOf(getKClassFromExpression(term.x3o()), type)) {
+          tmp_2 = term.x3o();
         } else {
           throw new TermToObjectConversionException(term, type);
         }
@@ -1668,10 +1668,10 @@
                   if (Companion_getInstance().matches(term, get_CAST_TEMPLATE())) {
                     tmp_8 = explicitConversion(this, term, term.get(0), term.get(1));
                   } else if (Companion_getInstance().matches(term, get_DEALIASING_TEMPLATE())) {
-                    var ref = this.b3q_1(term);
+                    var ref = this.s3q_1(term);
                     var tmp_9;
                     if (!(ref == null) ? isInterface(ref, ObjectRef) : false) {
-                      tmp_9 = this.f3p(type, ref);
+                      tmp_9 = this.w3p(type, ref);
                     } else {
                       throw TermToObjectConversionException_init_$Create$(term);
                     }
@@ -1697,15 +1697,15 @@
     }
     return tmp;
   };
-  protoOf(TermToObjectConverterImpl).h3p = function (term) {
+  protoOf(TermToObjectConverterImpl).y3p = function (term) {
     return first(admissibleTypesByPriority(this, term));
   };
-  protoOf(TermToObjectConverterImpl).g3p = function (term) {
+  protoOf(TermToObjectConverterImpl).x3p = function (term) {
     return toSet(admissibleTypesByPriority(this, term));
   };
   function TypeFactoryImpl() {
   }
-  protoOf(TypeFactoryImpl).k3p = function (typeName) {
+  protoOf(TypeFactoryImpl).b3q = function (typeName) {
     return kClassFromName(typeName).r2();
   };
   function nameOf_0($this, type) {
@@ -1718,292 +1718,292 @@
     return Companion_instance_14;
   }
   function TypeRefImpl(type) {
-    this.c3q_1 = type;
-    this.d3q_1 = Companion_getInstance_0().of(nameOf_0(Companion_instance_14, type));
+    this.t3q_1 = type;
+    this.u3q_1 = Companion_getInstance_0().of(nameOf_0(Companion_instance_14, type));
   }
-  protoOf(TypeRefImpl).r24 = function () {
-    return this.c3q_1;
+  protoOf(TypeRefImpl).z24 = function () {
+    return this.t3q_1;
   };
   protoOf(TypeRefImpl).rw = function () {
-    return this.d3q_1.rw();
+    return this.u3q_1.rw();
   };
   protoOf(TypeRefImpl).jx = function () {
-    return this.d3q_1.jx();
+    return this.u3q_1.jx();
   };
   protoOf(TypeRefImpl).kw = function () {
-    return this.d3q_1.kw();
+    return this.u3q_1.kw();
   };
   protoOf(TypeRefImpl).qw = function () {
-    return this.d3q_1.qw();
+    return this.u3q_1.qw();
   };
   protoOf(TypeRefImpl).ix = function () {
-    return this.d3q_1.ix();
+    return this.u3q_1.ix();
   };
   protoOf(TypeRefImpl).lw = function () {
-    return this.d3q_1.lw();
+    return this.u3q_1.lw();
   };
   protoOf(TypeRefImpl).xw = function () {
-    return this.d3q_1.xw();
+    return this.u3q_1.xw();
   };
   protoOf(TypeRefImpl).dx = function () {
-    return this.d3q_1.dx();
+    return this.u3q_1.dx();
   };
   protoOf(TypeRefImpl).mw = function () {
-    return this.d3q_1.mw();
+    return this.u3q_1.mw();
   };
   protoOf(TypeRefImpl).nw = function () {
-    return this.d3q_1.nw();
+    return this.u3q_1.nw();
   };
   protoOf(TypeRefImpl).hx = function () {
-    return this.d3q_1.hx();
+    return this.u3q_1.hx();
   };
   protoOf(TypeRefImpl).ux = function () {
-    return this.d3q_1.ux();
+    return this.u3q_1.ux();
   };
   protoOf(TypeRefImpl).fx = function () {
-    return this.d3q_1.fx();
+    return this.u3q_1.fx();
   };
   protoOf(TypeRefImpl).rx = function () {
-    return this.d3q_1.rx();
+    return this.u3q_1.rx();
   };
   protoOf(TypeRefImpl).cx = function () {
-    return this.d3q_1.cx();
+    return this.u3q_1.cx();
   };
   protoOf(TypeRefImpl).qx = function () {
-    return this.d3q_1.qx();
+    return this.u3q_1.qx();
   };
   protoOf(TypeRefImpl).sx = function () {
-    return this.d3q_1.sx();
+    return this.u3q_1.sx();
   };
   protoOf(TypeRefImpl).ox = function () {
-    return this.d3q_1.ox();
+    return this.u3q_1.ox();
   };
   protoOf(TypeRefImpl).yw = function () {
-    return this.d3q_1.yw();
+    return this.u3q_1.yw();
   };
   protoOf(TypeRefImpl).ww = function () {
-    return this.d3q_1.ww();
+    return this.u3q_1.ww();
   };
   protoOf(TypeRefImpl).ow = function () {
-    return this.d3q_1.ow();
+    return this.u3q_1.ow();
   };
   protoOf(TypeRefImpl).nx = function () {
-    return this.d3q_1.nx();
+    return this.u3q_1.nx();
   };
   protoOf(TypeRefImpl).bx = function () {
-    return this.d3q_1.bx();
+    return this.u3q_1.bx();
   };
   protoOf(TypeRefImpl).mx = function () {
-    return this.d3q_1.mx();
+    return this.u3q_1.mx();
   };
   protoOf(TypeRefImpl).vt = function () {
-    return this.d3q_1.vt();
+    return this.u3q_1.vt();
   };
   protoOf(TypeRefImpl).r2 = function () {
-    return this.d3q_1.r2();
+    return this.u3q_1.r2();
   };
   protoOf(TypeRefImpl).sw = function () {
-    return this.d3q_1.sw();
+    return this.u3q_1.sw();
   };
   protoOf(TypeRefImpl).addFirst = function (argument) {
-    return this.d3q_1.addFirst(argument);
+    return this.u3q_1.addFirst(argument);
   };
   protoOf(TypeRefImpl).addLast = function (argument) {
-    return this.d3q_1.addLast(argument);
+    return this.u3q_1.addLast(argument);
   };
   protoOf(TypeRefImpl).append = function (argument) {
-    return this.d3q_1.append(argument);
+    return this.u3q_1.append(argument);
   };
   protoOf(TypeRefImpl).vw = function () {
-    return this.d3q_1.vw();
+    return this.u3q_1.vw();
   };
   protoOf(TypeRefImpl).asAtom = function () {
     return this.vw();
   };
   protoOf(TypeRefImpl).asBlock = function () {
-    return this.d3q_1.asBlock();
+    return this.u3q_1.asBlock();
   };
   protoOf(TypeRefImpl).asClause = function () {
-    return this.d3q_1.asClause();
+    return this.u3q_1.asClause();
   };
   protoOf(TypeRefImpl).asCons = function () {
-    return this.d3q_1.asCons();
+    return this.u3q_1.asCons();
   };
   protoOf(TypeRefImpl).asDirective = function () {
-    return this.d3q_1.asDirective();
+    return this.u3q_1.asDirective();
   };
   protoOf(TypeRefImpl).asEmptyBlock = function () {
-    return this.d3q_1.asEmptyBlock();
+    return this.u3q_1.asEmptyBlock();
   };
   protoOf(TypeRefImpl).asEmptyList = function () {
-    return this.d3q_1.asEmptyList();
+    return this.u3q_1.asEmptyList();
   };
   protoOf(TypeRefImpl).asFact = function () {
-    return this.d3q_1.asFact();
+    return this.u3q_1.asFact();
   };
   protoOf(TypeRefImpl).asIndicator = function () {
-    return this.d3q_1.asIndicator();
+    return this.u3q_1.asIndicator();
   };
   protoOf(TypeRefImpl).asInteger = function () {
-    return this.d3q_1.asInteger();
+    return this.u3q_1.asInteger();
   };
   protoOf(TypeRefImpl).asList = function () {
-    return this.d3q_1.asList();
+    return this.u3q_1.asList();
   };
   protoOf(TypeRefImpl).asNumeric = function () {
-    return this.d3q_1.asNumeric();
+    return this.u3q_1.asNumeric();
   };
   protoOf(TypeRefImpl).asReal = function () {
-    return this.d3q_1.asReal();
+    return this.u3q_1.asReal();
   };
   protoOf(TypeRefImpl).asRecursive = function () {
-    return this.d3q_1.asRecursive();
+    return this.u3q_1.asRecursive();
   };
   protoOf(TypeRefImpl).asRule = function () {
-    return this.d3q_1.asRule();
+    return this.u3q_1.asRule();
   };
   protoOf(TypeRefImpl).gx = function () {
-    return this.d3q_1.gx();
+    return this.u3q_1.gx();
   };
   protoOf(TypeRefImpl).asStruct = function () {
     return this.gx();
   };
   protoOf(TypeRefImpl).asTerm = function () {
-    return this.d3q_1.asTerm();
+    return this.u3q_1.asTerm();
   };
   protoOf(TypeRefImpl).asTruth = function () {
-    return this.d3q_1.asTruth();
+    return this.u3q_1.asTruth();
   };
   protoOf(TypeRefImpl).asTuple = function () {
-    return this.d3q_1.asTuple();
+    return this.u3q_1.asTuple();
   };
   protoOf(TypeRefImpl).asVar = function () {
-    return this.d3q_1.asVar();
+    return this.u3q_1.asVar();
   };
   protoOf(TypeRefImpl).castToAtom = function () {
-    return this.d3q_1.castToAtom();
+    return this.u3q_1.castToAtom();
   };
   protoOf(TypeRefImpl).castToBlock = function () {
-    return this.d3q_1.castToBlock();
+    return this.u3q_1.castToBlock();
   };
   protoOf(TypeRefImpl).castToClause = function () {
-    return this.d3q_1.castToClause();
+    return this.u3q_1.castToClause();
   };
   protoOf(TypeRefImpl).castToCons = function () {
-    return this.d3q_1.castToCons();
+    return this.u3q_1.castToCons();
   };
   protoOf(TypeRefImpl).castToConstant = function () {
-    return this.d3q_1.castToConstant();
+    return this.u3q_1.castToConstant();
   };
   protoOf(TypeRefImpl).castToDirective = function () {
-    return this.d3q_1.castToDirective();
+    return this.u3q_1.castToDirective();
   };
   protoOf(TypeRefImpl).castToEmptyBlock = function () {
-    return this.d3q_1.castToEmptyBlock();
+    return this.u3q_1.castToEmptyBlock();
   };
   protoOf(TypeRefImpl).castToEmptyList = function () {
-    return this.d3q_1.castToEmptyList();
+    return this.u3q_1.castToEmptyList();
   };
   protoOf(TypeRefImpl).castToFact = function () {
-    return this.d3q_1.castToFact();
+    return this.u3q_1.castToFact();
   };
   protoOf(TypeRefImpl).castToIndicator = function () {
-    return this.d3q_1.castToIndicator();
+    return this.u3q_1.castToIndicator();
   };
   protoOf(TypeRefImpl).castToInteger = function () {
-    return this.d3q_1.castToInteger();
+    return this.u3q_1.castToInteger();
   };
   protoOf(TypeRefImpl).castToList = function () {
-    return this.d3q_1.castToList();
+    return this.u3q_1.castToList();
   };
   protoOf(TypeRefImpl).castToNumeric = function () {
-    return this.d3q_1.castToNumeric();
+    return this.u3q_1.castToNumeric();
   };
   protoOf(TypeRefImpl).castToReal = function () {
-    return this.d3q_1.castToReal();
+    return this.u3q_1.castToReal();
   };
   protoOf(TypeRefImpl).castToRecursive = function () {
-    return this.d3q_1.castToRecursive();
+    return this.u3q_1.castToRecursive();
   };
   protoOf(TypeRefImpl).castToRule = function () {
-    return this.d3q_1.castToRule();
+    return this.u3q_1.castToRule();
   };
   protoOf(TypeRefImpl).castToStruct = function () {
-    return this.d3q_1.castToStruct();
+    return this.u3q_1.castToStruct();
   };
   protoOf(TypeRefImpl).castToTerm = function () {
-    return this.d3q_1.castToTerm();
+    return this.u3q_1.castToTerm();
   };
   protoOf(TypeRefImpl).castToTruth = function () {
-    return this.d3q_1.castToTruth();
+    return this.u3q_1.castToTruth();
   };
   protoOf(TypeRefImpl).castToTuple = function () {
-    return this.d3q_1.castToTuple();
+    return this.u3q_1.castToTuple();
   };
   protoOf(TypeRefImpl).castToVar = function () {
-    return this.d3q_1.castToVar();
+    return this.u3q_1.castToVar();
   };
   protoOf(TypeRefImpl).lx = function (other) {
-    return this.d3q_1.lx(other);
+    return this.u3q_1.lx(other);
   };
   protoOf(TypeRefImpl).d = function (other) {
     return this.lx((!(other == null) ? isInterface(other, Term) : false) ? other : THROW_CCE());
   };
   protoOf(TypeRefImpl).containsTag = function (name) {
-    return this.d3q_1.containsTag(name);
+    return this.u3q_1.containsTag(name);
   };
   protoOf(TypeRefImpl).equalsUsingVarCompleteNames = function (other, useVarCompleteName) {
-    return this.d3q_1.equalsUsingVarCompleteNames(other, useVarCompleteName);
+    return this.u3q_1.equalsUsingVarCompleteNames(other, useVarCompleteName);
   };
   protoOf(TypeRefImpl).equals = function (other) {
-    return this.d3q_1.equals(other);
+    return this.u3q_1.equals(other);
   };
   protoOf(TypeRefImpl).get = function (index) {
-    return this.d3q_1.get(index);
+    return this.u3q_1.get(index);
   };
   protoOf(TypeRefImpl).getArgAt = function (index) {
-    return this.d3q_1.getArgAt(index);
+    return this.u3q_1.getArgAt(index);
   };
   protoOf(TypeRefImpl).getTag = function (name) {
-    return this.d3q_1.getTag(name);
+    return this.u3q_1.getTag(name);
   };
   protoOf(TypeRefImpl).hashCode = function () {
-    return this.d3q_1.hashCode();
+    return this.u3q_1.hashCode();
   };
   protoOf(TypeRefImpl).insertAt = function (index, argument) {
-    return this.d3q_1.insertAt(index, argument);
+    return this.u3q_1.insertAt(index, argument);
   };
   protoOf(TypeRefImpl).resetTags = function (tags) {
-    return this.d3q_1.resetTags(tags);
+    return this.u3q_1.resetTags(tags);
   };
   protoOf(TypeRefImpl).setArgs = function (args) {
-    return this.d3q_1.setArgs(args);
+    return this.u3q_1.setArgs(args);
   };
   protoOf(TypeRefImpl).setArgsIterable = function (args) {
-    return this.d3q_1.setArgsIterable(args);
+    return this.u3q_1.setArgsIterable(args);
   };
   protoOf(TypeRefImpl).setArgsSequence = function (args) {
-    return this.d3q_1.setArgsSequence(args);
+    return this.u3q_1.setArgsSequence(args);
   };
   protoOf(TypeRefImpl).setFunctor = function (functor) {
-    return this.d3q_1.setFunctor(functor);
+    return this.u3q_1.setFunctor(functor);
   };
   protoOf(TypeRefImpl).structurallyEquals = function (other) {
-    return this.d3q_1.structurallyEquals(other);
+    return this.u3q_1.structurallyEquals(other);
   };
   protoOf(TypeRefImpl).toString = function () {
-    return this.d3q_1.toString();
+    return this.u3q_1.toString();
   };
-  protoOf(TypeRefImpl).n3p = function (objectConverter, arguments_0) {
-    return create_0(this.c3q_1, objectConverter, arguments_0);
+  protoOf(TypeRefImpl).e3q = function (objectConverter, arguments_0) {
+    return create_0(this.t3q_1, objectConverter, arguments_0);
   };
-  protoOf(TypeRefImpl).h3o = function (objectConverter, methodName, arguments_0) {
-    var companionObjectRef = get_companionObjectRef(this.c3q_1);
+  protoOf(TypeRefImpl).y3o = function (objectConverter, methodName, arguments_0) {
+    var companionObjectRef = get_companionObjectRef(this.t3q_1);
     var tmp;
     if (companionObjectRef instanceof Some) {
       tmp = invoke_0(companionObjectRef.uq_1, objectConverter, methodName, arguments_0);
     } else {
-      tmp = invoke_1(this.c3q_1, objectConverter, methodName, arguments_0, null);
+      tmp = invoke_1(this.t3q_1, objectConverter, methodName, arguments_0, null);
     }
     return tmp;
   };
@@ -2040,17 +2040,17 @@
   protoOf(TypeRefImpl).applySubstitution = function (substitution) {
     return this.w16(substitution);
   };
-  protoOf(TypeRefImpl).b2o = function (substitution, substitutions) {
+  protoOf(TypeRefImpl).s2o = function (substitution, substitutions) {
     return this;
   };
   protoOf(TypeRefImpl).apply = function (substitution, substitutions) {
-    return this.b2o(substitution, substitutions);
+    return this.s2o(substitution, substitutions);
   };
-  protoOf(TypeRefImpl).a2o = function (substitution, substitutions) {
+  protoOf(TypeRefImpl).r2o = function (substitution, substitutions) {
     return this;
   };
   protoOf(TypeRefImpl).getSubstituted = function (substitution, substitutions) {
-    return this.a2o(substitution, substitutions);
+    return this.r2o(substitution, substitutions);
   };
   protoOf(TypeRefImpl).c16 = function (visitor) {
     return visitor.visitAtom(this);
@@ -2058,20 +2058,20 @@
   protoOf(TypeRefImpl).accept = function (visitor) {
     return this.c16(visitor);
   };
-  protoOf(TypeRefImpl).i3o = function (objectConverter, propertyName, value) {
-    var companionObjectRef = get_companionObjectRef(this.c3q_1);
+  protoOf(TypeRefImpl).z3o = function (objectConverter, propertyName, value) {
+    var companionObjectRef = get_companionObjectRef(this.t3q_1);
     if (companionObjectRef instanceof Some) {
       assign_0(companionObjectRef.uq_1, objectConverter, propertyName, value);
     } else {
-      assign_1(this.c3q_1, objectConverter, propertyName, value, null);
+      assign_1(this.t3q_1, objectConverter, propertyName, value, null);
     }
     return true;
   };
   function actuallyInvoke(_this__u8e3s4, $this, ref, method, resultTerm) {
-    var result = ref.h3o(get_termToObjectConverter(_this__u8e3s4), method.qw(), method.rw());
+    var result = ref.y3o(get_termToObjectConverter(_this__u8e3s4), method.qw(), method.rw());
     var tmp;
     if (result instanceof Value) {
-      tmp = Companion_getInstance_8().f2g(_this__u8e3s4, resultTerm, $this.f3q(result));
+      tmp = Companion_getInstance_8().w2g(_this__u8e3s4, resultTerm, $this.w3q(result));
     } else {
       tmp = Companion_getInstance_7().failed();
     }
@@ -2080,9 +2080,9 @@
   function AbstractInvoke(suffix) {
     Functional.call(this, 'invoke_' + suffix);
   }
-  protoOf(AbstractInvoke).j2p = function (_this__u8e3s4, first, second, third) {
-    Companion_getInstance_8().p2g(_this__u8e3s4, 0);
-    Companion_getInstance_8().p2g(_this__u8e3s4, 1);
+  protoOf(AbstractInvoke).a2q = function (_this__u8e3s4, first, second, third) {
+    Companion_getInstance_8().g2h(_this__u8e3s4, 0);
+    Companion_getInstance_8().g2h(_this__u8e3s4, 1);
     var method = isInterface(second, Struct) ? second : THROW_CCE();
     var tmp$ret$1;
     $l$block: {
@@ -2105,7 +2105,7 @@
       } catch ($p) {
         if ($p instanceof OopException) {
           var e = $p;
-          throw e.s3p(_this__u8e3s4.context, _this__u8e3s4.signature);
+          throw e.j3q(_this__u8e3s4.context, _this__u8e3s4.signature);
         } else {
           if ($p instanceof Error) {
             var e_0 = $p;
@@ -2118,22 +2118,22 @@
     }
     return tmp$ret$1;
   };
-  protoOf(AbstractInvoke).s2i = function (_this__u8e3s4, first, second, third) {
-    return this.j2p(_this__u8e3s4, first, second, third);
+  protoOf(AbstractInvoke).j2j = function (_this__u8e3s4, first, second, third) {
+    return this.a2q(_this__u8e3s4, first, second, third);
   };
   function AbstractIterableItems$computeOneSubstitution$lambda($converter) {
     return function (it) {
-      return $converter.i3p(it);
+      return $converter.z3p(it);
     };
   }
   function AbstractIterableItems$computeOneSubstitution$lambda_0(it) {
-    return Companion_getInstance_12().u3o_1.z3o(it);
+    return Companion_getInstance_12().l3p_1.q3p(it);
   }
   function AbstractIterableItems(iterable, target) {
     Functional_0.call(this, iterable + '_items');
-    this.h3q_1 = target;
+    this.y3q_1 = target;
   }
-  protoOf(AbstractIterableItems).g2p = function (_this__u8e3s4, first, second) {
+  protoOf(AbstractIterableItems).x2p = function (_this__u8e3s4, first, second) {
     var tmp;
     var tmp_0;
     if (isInterface(first, Var)) {
@@ -2145,54 +2145,54 @@
       // Inline function 'kotlin.let' call
       // Inline function 'kotlin.contracts.contract' call
       // Inline function 'it.unibo.tuprolog.solve.libs.oop.primitives.AbstractIterableItems.computeOneSubstitution.<anonymous>' call
-      Companion_getInstance_8().f2f(_this__u8e3s4);
+      Companion_getInstance_8().w2f(_this__u8e3s4);
       tmp = Companion_getInstance_7().failed();
     } else {
       if (isInterface(second, List_0)) {
         var converter = get_termToObjectConverter(_this__u8e3s4);
         var tmp_1 = second.uu();
-        var items = this.i3q(map(tmp_1, AbstractIterableItems$computeOneSubstitution$lambda(converter)));
-        var objectRef = Companion_getInstance_11().t3o(items);
-        tmp = Companion_getInstance_8().f2g(_this__u8e3s4, first, objectRef);
+        var items = this.z3q(map(tmp_1, AbstractIterableItems$computeOneSubstitution$lambda(converter)));
+        var objectRef = Companion_getInstance_11().k3p(items);
+        tmp = Companion_getInstance_8().w2g(_this__u8e3s4, first, objectRef);
       } else {
         if (isInterface(first, ObjectRef)) {
-          var obj = first.g3o();
+          var obj = first.x3o();
           var tmp_2;
-          if (this.j3q(obj)) {
-            var tmp_3 = this.k3q(!(obj == null) ? obj : THROW_CCE());
+          if (this.a3r(obj)) {
+            var tmp_3 = this.b3r(!(obj == null) ? obj : THROW_CCE());
             var items_0 = map(tmp_3, AbstractIterableItems$computeOneSubstitution$lambda_0);
-            tmp_2 = Companion_getInstance_8().f2g(_this__u8e3s4, second, Companion_instance_5.ofSequence(items_0));
+            tmp_2 = Companion_getInstance_8().w2g(_this__u8e3s4, second, Companion_instance_5.ofSequence(items_0));
           } else {
             tmp_2 = Companion_getInstance_7().failed();
           }
           tmp = tmp_2;
         } else {
-          throw Companion_instance_1.d28(_this__u8e3s4.context, _this__u8e3s4.signature, Expected_OBJECT_REFERENCE_getInstance(), first, 0);
+          throw Companion_instance_1.l28(_this__u8e3s4.context, _this__u8e3s4.signature, Expected_OBJECT_REFERENCE_getInstance(), first, 0);
         }
       }
     }
     return tmp;
   };
-  protoOf(AbstractIterableItems).q2f = function (_this__u8e3s4, first, second) {
-    return this.g2p(_this__u8e3s4, first, second);
+  protoOf(AbstractIterableItems).h2g = function (_this__u8e3s4, first, second) {
+    return this.x2p(_this__u8e3s4, first, second);
   };
   function ArrayItems() {
     ArrayItems_instance = this;
     AbstractIterableItems.call(this, 'array', PrimitiveClasses_getInstance().l7());
   }
-  protoOf(ArrayItems).i3q = function (_this__u8e3s4) {
+  protoOf(ArrayItems).z3q = function (_this__u8e3s4) {
     // Inline function 'kotlin.collections.toTypedArray' call
     var this_0 = toList(_this__u8e3s4);
     return copyToArray(this_0);
   };
-  protoOf(ArrayItems).j3q = function (_this__u8e3s4) {
+  protoOf(ArrayItems).a3r = function (_this__u8e3s4) {
     return !(_this__u8e3s4 == null) ? isArray(_this__u8e3s4) : false;
   };
-  protoOf(ArrayItems).n3q = function (_this__u8e3s4) {
+  protoOf(ArrayItems).e3r = function (_this__u8e3s4) {
     return asSequence(_this__u8e3s4);
   };
-  protoOf(ArrayItems).k3q = function (_this__u8e3s4) {
-    return this.n3q(isArray(_this__u8e3s4) ? _this__u8e3s4 : THROW_CCE());
+  protoOf(ArrayItems).b3r = function (_this__u8e3s4) {
+    return this.e3r(isArray(_this__u8e3s4) ? _this__u8e3s4 : THROW_CCE());
   };
   var ArrayItems_instance;
   function ArrayItems_getInstance() {
@@ -2204,9 +2204,9 @@
     Assign_instance = this;
     Predicative.call(this, 'assign');
   }
-  protoOf(Assign).p3q = function (_this__u8e3s4, first, second, third) {
-    Companion_getInstance_8().u2g(_this__u8e3s4, 0);
-    Companion_getInstance_8().u2g(_this__u8e3s4, 1);
+  protoOf(Assign).g3r = function (_this__u8e3s4, first, second, third) {
+    Companion_getInstance_8().l2h(_this__u8e3s4, 0);
+    Companion_getInstance_8().l2h(_this__u8e3s4, 1);
     var tmp$ret$1;
     $l$block: {
       // Inline function 'it.unibo.tuprolog.solve.libs.oop.primitives.catchingOopExceptions' call
@@ -2220,19 +2220,19 @@
         }
         var ref = tmp;
         var tmp_0;
-        if (Companion_getInstance_8().g2g(_this__u8e3s4, third, get_DEALIASING_TEMPLATE())) {
+        if (Companion_getInstance_8().x2g(_this__u8e3s4, third, get_DEALIASING_TEMPLATE())) {
           tmp_0 = findRefFromAlias(_this__u8e3s4, isInterface(third, Struct) ? third : THROW_CCE());
         } else {
           tmp_0 = third;
         }
         var value = tmp_0;
         var tmp_1 = get_termToObjectConverter(_this__u8e3s4);
-        tmp$ret$1 = ref.i3o(tmp_1, (isInterface(second, Atom) ? second : THROW_CCE()).r2(), value);
+        tmp$ret$1 = ref.z3o(tmp_1, (isInterface(second, Atom) ? second : THROW_CCE()).r2(), value);
         break $l$block;
       } catch ($p) {
         if ($p instanceof OopException) {
           var e = $p;
-          throw e.s3p(_this__u8e3s4.context, _this__u8e3s4.signature);
+          throw e.j3q(_this__u8e3s4.context, _this__u8e3s4.signature);
         } else {
           if ($p instanceof Error) {
             var e_0 = $p;
@@ -2245,8 +2245,8 @@
     }
     return tmp$ret$1;
   };
-  protoOf(Assign).u2i = function (_this__u8e3s4, first, second, third) {
-    return this.p3q(_this__u8e3s4, first, second, third);
+  protoOf(Assign).l2j = function (_this__u8e3s4, first, second, third) {
+    return this.g3r(_this__u8e3s4, first, second, third);
   };
   var Assign_instance;
   function Assign_getInstance() {
@@ -2259,8 +2259,8 @@
     if (type == null) {
       tmp = Companion_getInstance_7().failed();
     } else {
-      var casted = get_termToObjectConverter(_this__u8e3s4).f3p(type, term);
-      tmp = Companion_getInstance_8().f2g(_this__u8e3s4, result, Companion_getInstance_11().t3o(casted));
+      var casted = get_termToObjectConverter(_this__u8e3s4).w3p(type, term);
+      tmp = Companion_getInstance_8().w2g(_this__u8e3s4, result, Companion_getInstance_11().k3p(casted));
     }
     return tmp;
   }
@@ -2269,7 +2269,7 @@
   }
   function Cast$computeAll$lambda_0($$this$catchingOopExceptions, $first, $third, $second) {
     return function (it) {
-      return cast($$this$catchingOopExceptions, Cast_getInstance(), $first, it, $third).plus(Companion_getInstance_8().f2g($$this$catchingOopExceptions, $second, Companion_instance_12.j3p(it)));
+      return cast($$this$catchingOopExceptions, Cast_getInstance(), $first, it, $third).plus(Companion_getInstance_8().w2g($$this$catchingOopExceptions, $second, Companion_instance_12.a3q(it)));
     };
   }
   function Cast$computeAll$lambda_1($$this$catchingOopExceptions) {
@@ -2281,7 +2281,7 @@
     Cast_instance = this;
     TernaryRelation.call(this, 'cast');
   }
-  protoOf(Cast).r3q = function (_this__u8e3s4, first, second, third) {
+  protoOf(Cast).i3r = function (_this__u8e3s4, first, second, third) {
     var tmp$ret$1;
     $l$block: {
       // Inline function 'it.unibo.tuprolog.solve.libs.oop.primitives.catchingOopExceptions' call
@@ -2294,7 +2294,7 @@
           var tmp_0;
           try {
             var tmp_1 = Cast_getInstance();
-            tmp_0 = sequenceOf([_this__u8e3s4.replyWith(cast(_this__u8e3s4, tmp_1, first, type == null ? null : type.r24(), third), VOID, [])]);
+            tmp_0 = sequenceOf([_this__u8e3s4.replyWith(cast(_this__u8e3s4, tmp_1, first, type == null ? null : type.z24(), third), VOID, [])]);
           } catch ($p) {
             var tmp_2;
             if ($p instanceof TermToObjectConversionException) {
@@ -2308,7 +2308,7 @@
           tmp = tmp_0;
         } else {
           if (isInterface(second, Var)) {
-            var tmp_3 = asSequence_0(get_termToObjectConverter(_this__u8e3s4).g3p(first));
+            var tmp_3 = asSequence_0(get_termToObjectConverter(_this__u8e3s4).x3p(first));
             var tmp_4 = distinct(flatMap(tmp_3, Cast$computeAll$lambda));
             var tmp_5 = map(tmp_4, Cast$computeAll$lambda_0(_this__u8e3s4, first, third, second));
             tmp = map(tmp_5, Cast$computeAll$lambda_1(_this__u8e3s4));
@@ -2322,7 +2322,7 @@
       } catch ($p) {
         if ($p instanceof OopException) {
           var e = $p;
-          throw e.s3p(_this__u8e3s4.context, _this__u8e3s4.signature);
+          throw e.j3q(_this__u8e3s4.context, _this__u8e3s4.signature);
         } else {
           if ($p instanceof Error) {
             var e_0 = $p;
@@ -2335,8 +2335,8 @@
     }
     return tmp$ret$1;
   };
-  protoOf(Cast).n2i = function (_this__u8e3s4, first, second, third) {
-    return this.r3q(_this__u8e3s4, first, second, third);
+  protoOf(Cast).e2j = function (_this__u8e3s4, first, second, third) {
+    return this.i3r(_this__u8e3s4, first, second, third);
   };
   var Cast_instance;
   function Cast_getInstance() {
@@ -2348,8 +2348,8 @@
     InvokeMethod_instance = this;
     AbstractInvoke.call(this, 'method');
   }
-  protoOf(InvokeMethod).f3q = function (_this__u8e3s4) {
-    return _this__u8e3s4.t1i();
+  protoOf(InvokeMethod).w3q = function (_this__u8e3s4) {
+    return _this__u8e3s4.p1i();
   };
   var InvokeMethod_instance;
   function InvokeMethod_getInstance() {
@@ -2361,8 +2361,8 @@
     InvokeStrict_instance = this;
     AbstractInvoke.call(this, 'strict');
   }
-  protoOf(InvokeStrict).f3q = function (_this__u8e3s4) {
-    return _this__u8e3s4.a3p();
+  protoOf(InvokeStrict).w3q = function (_this__u8e3s4) {
+    return _this__u8e3s4.r3p();
   };
   var InvokeStrict_instance;
   function InvokeStrict_getInstance() {
@@ -2374,17 +2374,17 @@
     ListItems_instance = this;
     AbstractIterableItems.call(this, 'list', getKClass(List));
   }
-  protoOf(ListItems).i3q = function (_this__u8e3s4) {
+  protoOf(ListItems).z3q = function (_this__u8e3s4) {
     return toList(_this__u8e3s4);
   };
-  protoOf(ListItems).j3q = function (_this__u8e3s4) {
+  protoOf(ListItems).a3r = function (_this__u8e3s4) {
     return !(_this__u8e3s4 == null) ? isInterface(_this__u8e3s4, List) : false;
   };
-  protoOf(ListItems).w3q = function (_this__u8e3s4) {
+  protoOf(ListItems).n3r = function (_this__u8e3s4) {
     return asSequence_0(_this__u8e3s4);
   };
-  protoOf(ListItems).k3q = function (_this__u8e3s4) {
-    return this.w3q(isInterface(_this__u8e3s4, List) ? _this__u8e3s4 : THROW_CCE());
+  protoOf(ListItems).b3r = function (_this__u8e3s4) {
+    return this.n3r(isInterface(_this__u8e3s4, List) ? _this__u8e3s4 : THROW_CCE());
   };
   var ListItems_instance;
   function ListItems_getInstance() {
@@ -2396,9 +2396,9 @@
     NewObject3_instance = this;
     Functional.call(this, 'new_object');
   }
-  protoOf(NewObject3).j2p = function (_this__u8e3s4, first, second, third) {
-    Companion_getInstance_8().p2g(_this__u8e3s4, 0);
-    Companion_getInstance_8().z2g(_this__u8e3s4, 1);
+  protoOf(NewObject3).a2q = function (_this__u8e3s4, first, second, third) {
+    Companion_getInstance_8().g2h(_this__u8e3s4, 0);
+    Companion_getInstance_8().q2h(_this__u8e3s4, 1);
     var tmp$ret$3;
     $l$block: {
       // Inline function 'it.unibo.tuprolog.solve.libs.oop.primitives.catchingOopExceptions' call
@@ -2406,8 +2406,8 @@
         // Inline function 'it.unibo.tuprolog.solve.libs.oop.primitives.NewObject3.computeOneSubstitution.<anonymous>' call
         var type = getArgumentAsTypeRef(_this__u8e3s4, 0);
         var arguments_0 = (isInterface(second, List_0) ? second : THROW_CCE()).toArray();
-        var tmp1_safe_receiver = type == null ? null : type.m3p(get_termToObjectConverter(_this__u8e3s4), arguments_0.slice());
-        var objectReference = tmp1_safe_receiver == null ? null : tmp1_safe_receiver.a3p();
+        var tmp1_safe_receiver = type == null ? null : type.d3q(get_termToObjectConverter(_this__u8e3s4), arguments_0.slice());
+        var objectReference = tmp1_safe_receiver == null ? null : tmp1_safe_receiver.r3p();
         var tmp;
         if (objectReference == null) {
           tmp = null;
@@ -2415,7 +2415,7 @@
           // Inline function 'kotlin.let' call
           // Inline function 'kotlin.contracts.contract' call
           // Inline function 'it.unibo.tuprolog.solve.libs.oop.primitives.NewObject3.computeOneSubstitution.<anonymous>.<anonymous>' call
-          tmp = Companion_getInstance_8().f2g(_this__u8e3s4, objectReference, third);
+          tmp = Companion_getInstance_8().w2g(_this__u8e3s4, objectReference, third);
         }
         var tmp3_elvis_lhs = tmp;
         tmp$ret$3 = tmp3_elvis_lhs == null ? Companion_getInstance_7().failed() : tmp3_elvis_lhs;
@@ -2423,7 +2423,7 @@
       } catch ($p) {
         if ($p instanceof OopException) {
           var e = $p;
-          throw e.s3p(_this__u8e3s4.context, _this__u8e3s4.signature);
+          throw e.j3q(_this__u8e3s4.context, _this__u8e3s4.signature);
         } else {
           if ($p instanceof Error) {
             var e_0 = $p;
@@ -2436,8 +2436,8 @@
     }
     return tmp$ret$3;
   };
-  protoOf(NewObject3).s2i = function (_this__u8e3s4, first, second, third) {
-    return this.j2p(_this__u8e3s4, first, second, third);
+  protoOf(NewObject3).j2j = function (_this__u8e3s4, first, second, third) {
+    return this.a2q(_this__u8e3s4, first, second, third);
   };
   var NewObject3_instance;
   function NewObject3_getInstance() {
@@ -2449,7 +2449,7 @@
     NullRef_instance = this;
     TypeTester.call(this, 'null_ref');
   }
-  protoOf(NullRef_0).e2j = function (term) {
+  protoOf(NullRef_0).v2j = function (term) {
     return isInterface(term, NullRef);
   };
   var NullRef_instance;
@@ -2462,7 +2462,7 @@
     ObjectRef_instance = this;
     TypeTester.call(this, 'object_ref');
   }
-  protoOf(ObjectRef_0).e2j = function (term) {
+  protoOf(ObjectRef_0).v2j = function (term) {
     return isInterface(term, ObjectRef);
   };
   var ObjectRef_instance;
@@ -2495,7 +2495,7 @@
   function get_termToObjectConverter(_this__u8e3s4) {
     _init_properties_PrimitiveExtensions_kt__hfa11z();
     var tmp = Companion_getInstance_14();
-    return tmp.c3p(VOID, _get_termToObjectConverter_$lambda_4bacq4(_this__u8e3s4));
+    return tmp.t3p(VOID, _get_termToObjectConverter_$lambda_4bacq4(_this__u8e3s4));
   }
   function ensuringArgumentIsTypeRef(_this__u8e3s4, index) {
     _init_properties_PrimitiveExtensions_kt__hfa11z();
@@ -2512,7 +2512,7 @@
       tmp = _this__u8e3s4;
     } else {
       if (!isInterface(arg, TypeRef)) {
-        throw Companion_instance_1.d28(_this__u8e3s4.context, _this__u8e3s4.signature, Expected_TYPE_REFERENCE_getInstance(), arg, index);
+        throw Companion_instance_1.l28(_this__u8e3s4.context, _this__u8e3s4.signature, Expected_TYPE_REFERENCE_getInstance(), arg, index);
       } else {
         tmp = _this__u8e3s4;
       }
@@ -2521,14 +2521,14 @@
   }
   function getArgumentAsTypeRef(_this__u8e3s4, index) {
     _init_properties_PrimitiveExtensions_kt__hfa11z();
-    Companion_getInstance_8().p2g(_this__u8e3s4, index);
+    Companion_getInstance_8().g2h(_this__u8e3s4, index);
     var arg = _this__u8e3s4.arguments.c1(index);
     var tmp;
     if (isInterface(arg, TypeRef)) {
       tmp = arg;
     } else {
       if (isInterface(arg, Atom)) {
-        tmp = Companion_getInstance_15().e3p_1.l3p(arg.r2());
+        tmp = Companion_getInstance_15().v3p_1.c3q(arg.r2());
       } else {
         if (isDealiasingExpression(_this__u8e3s4, arg)) {
           var tmp_0 = findRefFromAlias(_this__u8e3s4, arg.castToStruct());
@@ -2549,7 +2549,7 @@
       tmp = _this__u8e3s4;
     } else {
       if (!isInterface(arg, Ref)) {
-        throw Companion_instance_1.d28(_this__u8e3s4.context, _this__u8e3s4.signature, Expected_REFERENCE_getInstance(), arg, index);
+        throw Companion_instance_1.l28(_this__u8e3s4.context, _this__u8e3s4.signature, Expected_REFERENCE_getInstance(), arg, index);
       } else {
         tmp = _this__u8e3s4;
       }
@@ -2573,7 +2573,7 @@
     var tmp_2 = filter(this_0, findRefFromAliasOrNull$lambda);
     var tmp$ret$0 = isInterface(tmp_2, Sequence) ? tmp_2 : THROW_CCE();
     var tmp0_safe_receiver = firstOrNull(tmp$ret$0);
-    var tmp1_safe_receiver = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.s1v();
+    var tmp1_safe_receiver = tmp0_safe_receiver == null ? null : tmp0_safe_receiver.a1w();
     var tmp2_safe_receiver = tmp1_safe_receiver == null ? null : tmp1_safe_receiver.get(1);
     return tmp2_safe_receiver == null ? null : tmp2_safe_receiver.kx();
   }
@@ -2581,7 +2581,7 @@
     _init_properties_PrimitiveExtensions_kt__hfa11z();
     var tmp;
     if (isInterface(term, Struct)) {
-      tmp = Companion_getInstance_8().g2g(_this__u8e3s4, term, get_DEALIASING_TEMPLATE());
+      tmp = Companion_getInstance_8().x2g(_this__u8e3s4, term, get_DEALIASING_TEMPLATE());
     } else {
       tmp = false;
     }
@@ -2592,7 +2592,7 @@
     var tmp;
     var tmp_0;
     if (isInterface(term, Struct)) {
-      tmp_0 = Companion_getInstance_8().g2g(_this__u8e3s4, term, get_DEALIASING_TEMPLATE());
+      tmp_0 = Companion_getInstance_8().x2g(_this__u8e3s4, term, get_DEALIASING_TEMPLATE());
     } else {
       tmp_0 = false;
     }
@@ -2641,7 +2641,7 @@
     Ref_instance = this;
     TypeTester.call(this, 'ref');
   }
-  protoOf(Ref_0).e2j = function (term) {
+  protoOf(Ref_0).v2j = function (term) {
     return isInterface(term, Ref);
   };
   var Ref_instance;
@@ -2654,7 +2654,7 @@
     return function ($this$replySuccess) {
       var tmp = Companion_instance_15;
       var tmp_0 = isInterface($second, Struct) ? $second : THROW_CCE();
-      $this$replySuccess.u2l([tmp.b3r(tmp_0, isInterface($first, Ref) ? $first : THROW_CCE()).i1u()]);
+      $this$replySuccess.l2m([tmp.s3r(tmp_0, isInterface($first, Ref) ? $first : THROW_CCE()).q1u()]);
       return Unit_instance;
     };
   }
@@ -2662,17 +2662,17 @@
     Register_instance = this;
     NonBacktrackable.call(this, 'register');
   }
-  protoOf(Register).w2o = function (_this__u8e3s4, first_0, second) {
-    Companion_getInstance_8().f2f(_this__u8e3s4);
+  protoOf(Register).n2p = function (_this__u8e3s4, first_0, second) {
+    Companion_getInstance_8().w2f(_this__u8e3s4);
     ensuringArgumentIsRef(_this__u8e3s4, 0);
-    Companion_getInstance_8().p2g(_this__u8e3s4, 1);
+    Companion_getInstance_8().g2h(_this__u8e3s4, 1);
     if (!second.ux()) {
-      throw Companion_instance_6.h26(_this__u8e3s4.context, _this__u8e3s4.signature, first(second.sw()), 0);
+      throw Companion_instance_6.p26(_this__u8e3s4.context, _this__u8e3s4.signature, first(second.sw()), 0);
     }
     return _this__u8e3s4.replySuccessBuildingSideEffects(VOID, VOID, Register$computeOne$lambda(second, first_0));
   };
-  protoOf(Register).h2f = function (_this__u8e3s4, first, second) {
-    return this.w2o(_this__u8e3s4, first, second);
+  protoOf(Register).y2f = function (_this__u8e3s4, first, second) {
+    return this.n2p(_this__u8e3s4, first, second);
   };
   var Register_instance;
   function Register_getInstance() {
@@ -2684,17 +2684,17 @@
     SetItems_instance = this;
     AbstractIterableItems.call(this, 'set', getKClass(Set));
   }
-  protoOf(SetItems).i3q = function (_this__u8e3s4) {
+  protoOf(SetItems).z3q = function (_this__u8e3s4) {
     return toSet(_this__u8e3s4);
   };
-  protoOf(SetItems).j3q = function (_this__u8e3s4) {
+  protoOf(SetItems).a3r = function (_this__u8e3s4) {
     return !(_this__u8e3s4 == null) ? isInterface(_this__u8e3s4, Set) : false;
   };
-  protoOf(SetItems).f3r = function (_this__u8e3s4) {
+  protoOf(SetItems).w3r = function (_this__u8e3s4) {
     return asSequence_0(_this__u8e3s4);
   };
-  protoOf(SetItems).k3q = function (_this__u8e3s4) {
-    return this.f3r(isInterface(_this__u8e3s4, Set) ? _this__u8e3s4 : THROW_CCE());
+  protoOf(SetItems).b3r = function (_this__u8e3s4) {
+    return this.w3r(isInterface(_this__u8e3s4, Set) ? _this__u8e3s4 : THROW_CCE());
   };
   var SetItems_instance;
   function SetItems_getInstance() {
@@ -2705,9 +2705,9 @@
   function Type() {
     Type_instance = this;
     Functional_0.call(this, 'type');
-    this.h3r_1 = Companion_getInstance_15().e3p_1;
+    this.y3r_1 = Companion_getInstance_15().v3p_1;
   }
-  protoOf(Type).g2p = function (_this__u8e3s4, first, second) {
+  protoOf(Type).x2p = function (_this__u8e3s4, first, second) {
     var tmp$ret$3;
     $l$block: {
       // Inline function 'it.unibo.tuprolog.solve.libs.oop.primitives.catchingOopExceptions' call
@@ -2721,20 +2721,20 @@
           tmp_0 = false;
         }
         if (tmp_0) {
-          Companion_getInstance_8().l2g(_this__u8e3s4, 0);
+          Companion_getInstance_8().c2h(_this__u8e3s4, 0);
           tmp = Companion_getInstance_7().failed();
         } else {
           if (isInterface(first, Var)) {
-            Companion_getInstance_8().u2g(_this__u8e3s4, 1);
+            Companion_getInstance_8().l2h(_this__u8e3s4, 1);
             ensuringArgumentIsTypeRef(_this__u8e3s4, 1);
             var tmp_1 = Companion_getInstance_8();
             var tmp_2 = Companion_getInstance_0();
-            tmp = tmp_1.f2g(_this__u8e3s4, first, tmp_2.of(get_name((isInterface(second, TypeRef) ? second : THROW_CCE()).r24())));
+            tmp = tmp_1.w2g(_this__u8e3s4, first, tmp_2.of(get_name((isInterface(second, TypeRef) ? second : THROW_CCE()).z24())));
           } else {
             if (isInterface(second, Var)) {
-              Companion_getInstance_8().u2g(_this__u8e3s4, 0);
-              var tmp_3 = Type_getInstance().h3r_1;
-              var tmp0_safe_receiver = tmp_3.l3p((isInterface(first, Atom) ? first : THROW_CCE()).r2());
+              Companion_getInstance_8().l2h(_this__u8e3s4, 0);
+              var tmp_3 = Type_getInstance().y3r_1;
+              var tmp0_safe_receiver = tmp_3.c3q((isInterface(first, Atom) ? first : THROW_CCE()).r2());
               var tmp_4;
               if (tmp0_safe_receiver == null) {
                 tmp_4 = null;
@@ -2742,12 +2742,12 @@
                 // Inline function 'kotlin.let' call
                 // Inline function 'kotlin.contracts.contract' call
                 // Inline function 'it.unibo.tuprolog.solve.libs.oop.primitives.Type.computeOneSubstitution.<anonymous>.<anonymous>' call
-                tmp_4 = Companion_getInstance_8().f2g(_this__u8e3s4, tmp0_safe_receiver, second);
+                tmp_4 = Companion_getInstance_8().w2g(_this__u8e3s4, tmp0_safe_receiver, second);
               }
               var tmp1_elvis_lhs = tmp_4;
               tmp = tmp1_elvis_lhs == null ? Companion_getInstance_7().failed() : tmp1_elvis_lhs;
             } else {
-              Companion_getInstance_8().u2g(_this__u8e3s4, 0);
+              Companion_getInstance_8().l2h(_this__u8e3s4, 0);
               tmp = Companion_getInstance_7().failed();
             }
           }
@@ -2757,7 +2757,7 @@
       } catch ($p) {
         if ($p instanceof OopException) {
           var e = $p;
-          throw e.s3p(_this__u8e3s4.context, _this__u8e3s4.signature);
+          throw e.j3q(_this__u8e3s4.context, _this__u8e3s4.signature);
         } else {
           if ($p instanceof Error) {
             var e_0 = $p;
@@ -2770,8 +2770,8 @@
     }
     return tmp$ret$3;
   };
-  protoOf(Type).q2f = function (_this__u8e3s4, first, second) {
-    return this.g2p(_this__u8e3s4, first, second);
+  protoOf(Type).h2g = function (_this__u8e3s4, first, second) {
+    return this.x2p(_this__u8e3s4, first, second);
   };
   var Type_instance;
   function Type_getInstance() {
@@ -2783,7 +2783,7 @@
     TypeRef_instance = this;
     TypeTester.call(this, 'type_ref');
   }
-  protoOf(TypeRef_0).e2j = function (term) {
+  protoOf(TypeRef_0).v2j = function (term) {
     return isInterface(term, TypeRef);
   };
   var TypeRef_instance;
@@ -2799,7 +2799,7 @@
   }
   function Unregister$computeOne$lambda_0($toBeRemoved) {
     return function ($this$replySuccess) {
-      $this$replySuccess.v2l($toBeRemoved);
+      $this$replySuccess.m2m($toBeRemoved);
       return Unit_instance;
     };
   }
@@ -2807,14 +2807,14 @@
     Unregister_instance = this;
     NonBacktrackable_0.call(this, 'unregister');
   }
-  protoOf(Unregister).f2o = function (_this__u8e3s4, first_0) {
-    Companion_getInstance_8().p2g(_this__u8e3s4, 0);
+  protoOf(Unregister).w2o = function (_this__u8e3s4, first_0) {
+    Companion_getInstance_8().g2h(_this__u8e3s4, 0);
     if (!first_0.ux()) {
-      throw Companion_instance_6.h26(_this__u8e3s4.context, _this__u8e3s4.signature, first(first_0.sw()), 0);
+      throw Companion_instance_6.p26(_this__u8e3s4.context, _this__u8e3s4.signature, first(first_0.sw()), 0);
     }
     var tmp = Companion_getInstance_10();
     var pattern = tmp.of('alias', [first_0, Companion_getInstance_9().anonymous()]);
-    var tmp_0 = _this__u8e3s4.context.w1u().getByHead(pattern);
+    var tmp_0 = _this__u8e3s4.context.e1v().getByHead(pattern);
     var toBeRemoved = toList(filter(tmp_0, Unregister$computeOne$lambda(first_0)));
     var tmp_1;
     if (toBeRemoved.y()) {
@@ -2824,8 +2824,8 @@
     }
     return tmp_1;
   };
-  protoOf(Unregister).z2i = function (_this__u8e3s4, first) {
-    return this.f2o(_this__u8e3s4, first);
+  protoOf(Unregister).q2j = function (_this__u8e3s4, first) {
+    return this.w2o(_this__u8e3s4, first);
   };
   var Unregister_instance;
   function Unregister_getInstance() {
@@ -2834,12 +2834,12 @@
     return Unregister_instance;
   }
   function Companion_7() {
-    this.p3o_1 = 'alias';
+    this.g3p_1 = 'alias';
   }
-  protoOf(Companion_7).q3o = function (alias, type) {
-    return new Alias(Companion_getInstance_0().of(alias), Companion_instance_12.j3p(type));
+  protoOf(Companion_7).h3p = function (alias, type) {
+    return new Alias(Companion_getInstance_0().of(alias), Companion_instance_12.a3q(type));
   };
-  protoOf(Companion_7).b3r = function (alias, ref) {
+  protoOf(Companion_7).s3r = function (alias, ref) {
     return new Alias(alias, ref);
   };
   var Companion_instance_15;
@@ -2848,62 +2848,62 @@
   }
   function Alias(alias, ref) {
     RuleWrapper_init_$Init$('alias', 2, VOID, this);
-    this.n3r_1 = alias;
-    this.o3r_1 = ref;
+    this.e3s_1 = alias;
+    this.f3s_1 = ref;
     // Inline function 'kotlin.require' call
     // Inline function 'kotlin.contracts.contract' call
-    if (!this.n3r_1.ux()) {
+    if (!this.e3s_1.ux()) {
       // Inline function 'it.unibo.tuprolog.solve.libs.oop.rules.Alias.<anonymous>' call
-      var message = 'Alias must be a ground term, got: ' + this.n3r_1;
+      var message = 'Alias must be a ground term, got: ' + this.e3s_1;
       throw IllegalArgumentException_init_$Create$(toString_0(message));
     }
   }
-  protoOf(Alias).f2j = function (_this__u8e3s4) {
-    return toList(sequenceOf([this.n3r_1, this.o3r_1]));
+  protoOf(Alias).w2j = function (_this__u8e3s4) {
+    return toList(sequenceOf([this.e3s_1, this.f3s_1]));
   };
   function _get_R__7mlo3j($this) {
-    return $this.s3r_1.m1i($this, R$factory());
+    return $this.j3s_1.getValue($this, R$factory());
   }
   function _get_X__7mlo8p($this) {
-    return $this.t3r_1.m1i($this, X$factory());
+    return $this.k3s_1.getValue($this, X$factory());
   }
   function _get_Y__7mlo9k($this) {
-    return $this.u3r_1.m1i($this, Y$factory());
+    return $this.l3s_1.getValue($this, Y$factory());
   }
   function _get_T__7mlo59($this) {
-    return $this.v3r_1.m1i($this, T$factory());
+    return $this.m3s_1.getValue($this, T$factory());
   }
   function _get_R__7mlo3j_0($this) {
-    return $this.z3r_1.m1i($this, R$factory_0());
+    return $this.q3s_1.getValue($this, R$factory_0());
   }
   function _get_M__7mlnz8($this) {
-    return $this.a3s_1.m1i($this, M$factory());
+    return $this.r3s_1.getValue($this, M$factory());
   }
   function _get_C__7mlnqm($this) {
-    return $this.e3s_1.m1i($this, C$factory());
+    return $this.v3s_1.getValue($this, C$factory());
   }
   function _get_P__7mlo1t($this) {
-    return $this.f3s_1.m1i($this, P$factory());
+    return $this.w3s_1.getValue($this, P$factory());
   }
   function _get_R__7mlo3j_1($this) {
-    return $this.g3s_1.m1i($this, R$factory_1());
+    return $this.x3s_1.getValue($this, R$factory_1());
   }
   function _get_V__7mlo6z($this) {
-    return $this.h3s_1.m1i($this, V$factory());
+    return $this.y3s_1.getValue($this, V$factory());
   }
   function Cast_0() {
     Cast_instance_0 = this;
     ColonEquals.call(this);
-    this.s3r_1 = this.s1y_1;
-    this.t3r_1 = this.s1y_1;
-    this.u3r_1 = this.s1y_1;
-    this.v3r_1 = this.s1y_1;
+    this.j3s_1 = this.a1z_1;
+    this.k3s_1 = this.a1z_1;
+    this.l3s_1 = this.a1z_1;
+    this.m3s_1 = this.a1z_1;
   }
-  protoOf(Cast_0).f2j = function (_this__u8e3s4) {
+  protoOf(Cast_0).w2j = function (_this__u8e3s4) {
     var tmp = _get_R__7mlo3j(this);
-    return _this__u8e3s4.ktListOf([tmp, _this__u8e3s4.structOf('as', [_get_X__7mlo8p(this), _get_T__7mlo59(this)])]);
+    return listOf([tmp, _this__u8e3s4.structOf('as', [_get_X__7mlo8p(this), _get_T__7mlo59(this)])]);
   };
-  protoOf(Cast_0).g2j = function (_this__u8e3s4) {
+  protoOf(Cast_0).x2j = function (_this__u8e3s4) {
     // Inline function 'it.unibo.tuprolog.solve.AbstractWrapper.functor' call
     var tmp$ret$0 = Var_getInstance().signature.name;
     var tmp = _this__u8e3s4.structOf(tmp$ret$0, [_get_R__7mlo3j(this)]);
@@ -2922,13 +2922,13 @@
   function Invocation() {
     Invocation_instance = this;
     ColonEquals.call(this);
-    this.z3r_1 = this.s1y_1;
-    this.a3s_1 = this.s1y_1;
+    this.q3s_1 = this.a1z_1;
+    this.r3s_1 = this.a1z_1;
   }
-  protoOf(Invocation).f2j = function (_this__u8e3s4) {
+  protoOf(Invocation).w2j = function (_this__u8e3s4) {
     return listOf([_get_R__7mlo3j_0(this), _get_M__7mlnz8(this)]);
   };
-  protoOf(Invocation).g2j = function (_this__u8e3s4) {
+  protoOf(Invocation).x2j = function (_this__u8e3s4) {
     // Inline function 'it.unibo.tuprolog.solve.AbstractWrapper.functor' call
     var tmp$ret$0 = Var_getInstance().signature.name;
     var tmp = _this__u8e3s4.structOf(tmp$ret$0, [_get_R__7mlo3j_0(this)]);
@@ -2944,15 +2944,15 @@
   function Assignment() {
     Assignment_instance = this;
     ColonEquals.call(this);
-    this.e3s_1 = this.s1y_1;
-    this.f3s_1 = this.s1y_1;
-    this.g3s_1 = this.s1y_1;
-    this.h3s_1 = this.s1y_1;
+    this.v3s_1 = this.a1z_1;
+    this.w3s_1 = this.a1z_1;
+    this.x3s_1 = this.a1z_1;
+    this.y3s_1 = this.a1z_1;
   }
-  protoOf(Assignment).f2j = function (_this__u8e3s4) {
+  protoOf(Assignment).w2j = function (_this__u8e3s4) {
     return listOf([_get_C__7mlnqm(this), _get_V__7mlo6z(this)]);
   };
-  protoOf(Assignment).g2j = function (_this__u8e3s4) {
+  protoOf(Assignment).x2j = function (_this__u8e3s4) {
     var tmp = _this__u8e3s4.structOf('property_reduce', [_get_C__7mlnqm(this), _get_R__7mlo3j_1(this), _get_P__7mlo1t(this)]);
     // Inline function 'it.unibo.tuprolog.solve.AbstractWrapper.functor' call
     var tmp$ret$0 = Assign_getInstance().signature.name;
@@ -3018,21 +3018,21 @@
     }, null);
   }
   function _get_Method__a3idyi($this) {
-    return $this.l3s_1.m1i($this, Method$factory());
+    return $this.c3t_1.getValue($this, Method$factory());
   }
   function _get_Ref__e5vi4e($this) {
-    return $this.m3s_1.m1i($this, Ref$factory());
+    return $this.d3t_1.getValue($this, Ref$factory());
   }
   function Dot() {
     Dot_instance = this;
     RuleWrapper_init_$Init$('.', 2, VOID, this);
-    this.l3s_1 = this.s1y_1;
-    this.m3s_1 = this.s1y_1;
+    this.c3t_1 = this.a1z_1;
+    this.d3t_1 = this.a1z_1;
   }
-  protoOf(Dot).f2j = function (_this__u8e3s4) {
+  protoOf(Dot).w2j = function (_this__u8e3s4) {
     return listOf([_get_Ref__e5vi4e(this), _get_Method__a3idyi(this)]);
   };
-  protoOf(Dot).g2j = function (_this__u8e3s4) {
+  protoOf(Dot).x2j = function (_this__u8e3s4) {
     return _this__u8e3s4.structOf('fluent_reduce', [_this__u8e3s4.consOf(_get_Ref__e5vi4e(this), _get_Method__a3idyi(this)), _this__u8e3s4.f12()]);
   };
   var Dot_instance;
@@ -3052,26 +3052,26 @@
     }, null);
   }
   function _get_P__7mlo1t_0($this) {
-    return $this.r3s_1.m1i($this, P$factory_0());
+    return $this.i3t_1.getValue($this, P$factory_0());
   }
   function _get_M__7mlnz8_0($this) {
-    return $this.s3s_1.m1i($this, M$factory_0());
+    return $this.j3t_1.getValue($this, M$factory_0());
   }
   function _get_P1__ndbjd6($this) {
-    return $this.t3s_1.m1i($this, P1$factory());
+    return $this.k3t_1.getValue($this, P1$factory());
   }
   function _get_X__7mlo8p_0($this) {
-    return $this.u3s_1.m1i($this, X$factory_0());
+    return $this.l3t_1.getValue($this, X$factory_0());
   }
   function _get_P__7mlo1t_1($this) {
-    return $this.z3s_1.m1i($this, P$factory_1());
+    return $this.q3t_1.getValue($this, P$factory_1());
   }
   function _get_M__7mlnz8_1($this) {
-    return $this.a3t_1.m1i($this, M$factory_1());
+    return $this.r3t_1.getValue($this, M$factory_1());
   }
   function Companion_8() {
-    this.b3t_1 = 'fluent_reduce';
-    this.c3t_1 = 2;
+    this.s3t_1 = 'fluent_reduce';
+    this.t3t_1 = 2;
   }
   var Companion_instance_16;
   function Companion_getInstance_20() {
@@ -3080,19 +3080,19 @@
   function Recursive() {
     Recursive_instance = this;
     FluentReduce.call(this);
-    this.r3s_1 = this.s1y_1;
-    this.s3s_1 = this.s1y_1;
-    this.t3s_1 = this.s1y_1;
-    this.u3s_1 = this.s1y_1;
+    this.i3t_1 = this.a1z_1;
+    this.j3t_1 = this.a1z_1;
+    this.k3t_1 = this.a1z_1;
+    this.l3t_1 = this.a1z_1;
   }
-  protoOf(Recursive).f2j = function (_this__u8e3s4) {
-    return listOf([_this__u8e3s4.g12([_get_P__7mlo1t_0(this), _get_M__7mlnz8_0(this)], _get_X__7mlo8p_0(this)), this.h3t()]);
+  protoOf(Recursive).w2j = function (_this__u8e3s4) {
+    return listOf([_this__u8e3s4.g12([_get_P__7mlo1t_0(this), _get_M__7mlnz8_0(this)], _get_X__7mlo8p_0(this)), this.y3t()]);
   };
-  protoOf(Recursive).g2j = function (_this__u8e3s4) {
+  protoOf(Recursive).x2j = function (_this__u8e3s4) {
     var tmp = _this__u8e3s4.atomOf('!');
     // Inline function 'it.unibo.tuprolog.solve.AbstractWrapper.functor' call
     var tmp$ret$0 = InvokeMethod_getInstance().signature.name;
-    return _this__u8e3s4.tupleOf([tmp, _this__u8e3s4.structOf(tmp$ret$0, [_get_P__7mlo1t_0(this), _get_M__7mlnz8_0(this), _get_P1__ndbjd6(this)]), _this__u8e3s4.structOf('fluent_reduce', [_this__u8e3s4.consOf(_get_P1__ndbjd6(this), _get_X__7mlo8p_0(this)), this.h3t()])]);
+    return _this__u8e3s4.tupleOf([tmp, _this__u8e3s4.structOf(tmp$ret$0, [_get_P__7mlo1t_0(this), _get_M__7mlnz8_0(this), _get_P1__ndbjd6(this)]), _this__u8e3s4.structOf('fluent_reduce', [_this__u8e3s4.consOf(_get_P1__ndbjd6(this), _get_X__7mlo8p_0(this)), this.y3t()])]);
   };
   var Recursive_instance;
   function Recursive_getInstance() {
@@ -3103,17 +3103,17 @@
   function Couple() {
     Couple_instance = this;
     FluentReduce.call(this);
-    this.z3s_1 = this.s1y_1;
-    this.a3t_1 = this.s1y_1;
+    this.q3t_1 = this.a1z_1;
+    this.r3t_1 = this.a1z_1;
   }
-  protoOf(Couple).f2j = function (_this__u8e3s4) {
-    return listOf([_this__u8e3s4.consOf(_get_P__7mlo1t_1(this), _get_M__7mlnz8_1(this)), this.h3t()]);
+  protoOf(Couple).w2j = function (_this__u8e3s4) {
+    return listOf([_this__u8e3s4.consOf(_get_P__7mlo1t_1(this), _get_M__7mlnz8_1(this)), this.y3t()]);
   };
-  protoOf(Couple).g2j = function (_this__u8e3s4) {
+  protoOf(Couple).x2j = function (_this__u8e3s4) {
     var tmp = _this__u8e3s4.atomOf('!');
     // Inline function 'it.unibo.tuprolog.solve.AbstractWrapper.functor' call
     var tmp$ret$0 = InvokeMethod_getInstance().signature.name;
-    return _this__u8e3s4.tupleOf([tmp, _this__u8e3s4.structOf(tmp$ret$0, [_get_P__7mlo1t_1(this), _get_M__7mlnz8_1(this), this.h3t()])]);
+    return _this__u8e3s4.tupleOf([tmp, _this__u8e3s4.structOf(tmp$ret$0, [_get_P__7mlo1t_1(this), _get_M__7mlnz8_1(this), this.y3t()])]);
   };
   var Couple_instance;
   function Couple_getInstance() {
@@ -3125,8 +3125,8 @@
     Trivial_instance = this;
     FluentReduce.call(this);
   }
-  protoOf(Trivial).f2j = function (_this__u8e3s4) {
-    return listOf([this.h3t(), this.h3t()]);
+  protoOf(Trivial).w2j = function (_this__u8e3s4) {
+    return listOf([this.y3t(), this.y3t()]);
   };
   var Trivial_instance;
   function Trivial_getInstance() {
@@ -3136,17 +3136,17 @@
   }
   function FluentReduce() {
     RuleWrapper_init_$Init$('fluent_reduce', 2, VOID, this);
-    this.g3t_1 = this.s1y_1;
+    this.x3t_1 = this.a1z_1;
   }
-  protoOf(FluentReduce).h3t = function () {
-    return this.g3t_1.m1i(this, R$factory_2());
+  protoOf(FluentReduce).y3t = function () {
+    return this.x3t_1.getValue(this, R$factory_2());
   };
-  protoOf(FluentReduce).g2j = function (_this__u8e3s4) {
+  protoOf(FluentReduce).x2j = function (_this__u8e3s4) {
     return _this__u8e3s4.atomOf('!');
   };
   function R$factory_2() {
     return getPropertyCallableRef('R', 1, KProperty1, function (receiver) {
-      return receiver.h3t();
+      return receiver.y3t();
     }, null);
   }
   function P$factory_0() {
@@ -3180,23 +3180,23 @@
     }, null);
   }
   function _get_Type__cwwv8x($this) {
-    return $this.p3t_1.m1i($this, Type$factory());
+    return $this.g3u_1.getValue($this, Type$factory());
   }
   function _get_Instance__cwfjuy($this) {
-    return $this.q3t_1.m1i($this, Instance$factory());
+    return $this.h3u_1.getValue($this, Instance$factory());
   }
   function NewObject2() {
     NewObject2_instance = this;
     // Inline function 'it.unibo.tuprolog.solve.AbstractWrapper.functor' call
     var tmp$ret$0 = NewObject3_getInstance().signature.name;
     RuleWrapper_init_$Init$(tmp$ret$0, 2, VOID, this);
-    this.p3t_1 = this.s1y_1;
-    this.q3t_1 = this.s1y_1;
+    this.g3u_1 = this.a1z_1;
+    this.h3u_1 = this.a1z_1;
   }
-  protoOf(NewObject2).f2j = function (_this__u8e3s4) {
+  protoOf(NewObject2).w2j = function (_this__u8e3s4) {
     return listOf([_get_Type__cwwv8x(this), _get_Instance__cwfjuy(this)]);
   };
-  protoOf(NewObject2).g2j = function (_this__u8e3s4) {
+  protoOf(NewObject2).x2j = function (_this__u8e3s4) {
     // Inline function 'it.unibo.tuprolog.solve.AbstractWrapper.functor' call
     var tmp$ret$0 = NewObject3_getInstance().signature.name;
     return _this__u8e3s4.structOf(tmp$ret$0, [_get_Type__cwwv8x(this), _this__u8e3s4.e12(), _get_Instance__cwfjuy(this)]);
@@ -3218,20 +3218,20 @@
     }, null);
   }
   function _get_B1__ndb8zg($this) {
-    return $this.w3t_1.m1i($this, B1$factory());
+    return $this.n3u_1.getValue($this, B1$factory());
   }
   function _get_C__7mlnqm_0($this) {
-    return $this.x3t_1.m1i($this, C$factory_0());
+    return $this.o3u_1.getValue($this, C$factory_0());
   }
   function _get_O__7mlo0y($this) {
-    return $this.y3t_1.m1i($this, O$factory());
+    return $this.p3u_1.getValue($this, O$factory());
   }
   function _get_P__7mlo1t_2($this) {
-    return $this.z3t_1.m1i($this, P$factory_2());
+    return $this.q3u_1.getValue($this, P$factory_2());
   }
   function Companion_9() {
-    this.a3u_1 = 'property_reduce';
-    this.b3u_1 = 3;
+    this.r3u_1 = 'property_reduce';
+    this.s3u_1 = 3;
   }
   var Companion_instance_17;
   function Companion_getInstance_21() {
@@ -3240,19 +3240,19 @@
   function Recursive_0() {
     Recursive_instance_0 = this;
     PropertyReduce.call(this);
-    this.w3t_1 = this.s1y_1;
-    this.x3t_1 = this.s1y_1;
-    this.y3t_1 = this.s1y_1;
-    this.z3t_1 = this.s1y_1;
+    this.n3u_1 = this.a1z_1;
+    this.o3u_1 = this.a1z_1;
+    this.p3u_1 = this.a1z_1;
+    this.q3u_1 = this.a1z_1;
   }
-  protoOf(Recursive_0).f2j = function (_this__u8e3s4) {
-    return listOf([_this__u8e3s4.g12([this.h3u(), this.i3u()], _get_C__7mlnqm_0(this)), _get_O__7mlo0y(this), _get_P__7mlo1t_2(this)]);
+  protoOf(Recursive_0).w2j = function (_this__u8e3s4) {
+    return listOf([_this__u8e3s4.g12([this.y3u(), this.z3u()], _get_C__7mlnqm_0(this)), _get_O__7mlo0y(this), _get_P__7mlo1t_2(this)]);
   };
-  protoOf(Recursive_0).g2j = function (_this__u8e3s4) {
+  protoOf(Recursive_0).x2j = function (_this__u8e3s4) {
     var tmp = _this__u8e3s4.atomOf('!');
     // Inline function 'it.unibo.tuprolog.solve.AbstractWrapper.functor' call
     var tmp$ret$0 = InvokeMethod_getInstance().signature.name;
-    return _this__u8e3s4.tupleOf([tmp, _this__u8e3s4.structOf(tmp$ret$0, [this.h3u(), this.i3u(), _get_B1__ndb8zg(this)]), _this__u8e3s4.structOf('property_reduce', [_this__u8e3s4.consOf(_get_B1__ndb8zg(this), _get_C__7mlnqm_0(this)), _get_O__7mlo0y(this), _get_P__7mlo1t_2(this)])]);
+    return _this__u8e3s4.tupleOf([tmp, _this__u8e3s4.structOf(tmp$ret$0, [this.y3u(), this.z3u(), _get_B1__ndb8zg(this)]), _this__u8e3s4.structOf('property_reduce', [_this__u8e3s4.consOf(_get_B1__ndb8zg(this), _get_C__7mlnqm_0(this)), _get_O__7mlo0y(this), _get_P__7mlo1t_2(this)])]);
   };
   var Recursive_instance_0;
   function Recursive_getInstance_0() {
@@ -3264,8 +3264,8 @@
     Base_instance = this;
     PropertyReduce.call(this);
   }
-  protoOf(Base).f2j = function (_this__u8e3s4) {
-    return listOf([_this__u8e3s4.consOf(this.h3u(), this.i3u()), this.h3u(), this.i3u()]);
+  protoOf(Base).w2j = function (_this__u8e3s4) {
+    return listOf([_this__u8e3s4.consOf(this.y3u(), this.z3u()), this.y3u(), this.z3u()]);
   };
   var Base_instance;
   function Base_getInstance() {
@@ -3275,26 +3275,26 @@
   }
   function PropertyReduce() {
     RuleWrapper_init_$Init$('property_reduce', 3, VOID, this);
-    this.f3u_1 = this.s1y_1;
-    this.g3u_1 = this.s1y_1;
+    this.w3u_1 = this.a1z_1;
+    this.x3u_1 = this.a1z_1;
   }
-  protoOf(PropertyReduce).h3u = function () {
-    return this.f3u_1.m1i(this, A$factory());
+  protoOf(PropertyReduce).y3u = function () {
+    return this.w3u_1.getValue(this, A$factory());
   };
-  protoOf(PropertyReduce).i3u = function () {
-    return this.g3u_1.m1i(this, B$factory());
+  protoOf(PropertyReduce).z3u = function () {
+    return this.x3u_1.getValue(this, B$factory());
   };
-  protoOf(PropertyReduce).g2j = function (_this__u8e3s4) {
+  protoOf(PropertyReduce).x2j = function (_this__u8e3s4) {
     return _this__u8e3s4.atomOf('!');
   };
   function A$factory() {
     return getPropertyCallableRef('A', 1, KProperty1, function (receiver) {
-      return receiver.h3u();
+      return receiver.y3u();
     }, null);
   }
   function B$factory() {
     return getPropertyCallableRef('B', 1, KProperty1, function (receiver) {
-      return receiver.i3u();
+      return receiver.z3u();
     }, null);
   }
   function B1$factory() {
@@ -3416,12 +3416,12 @@
     }
   }
   //region block: post-declaration
-  protoOf(NullRefImpl).g3o = get_object;
-  protoOf(NullRefImpl).h3o = invoke;
-  protoOf(NullRefImpl).i3o = assign;
-  protoOf(TermToObjectConverterImpl).i3p = convert;
-  protoOf(TypeFactoryImpl).l3p = typeRefFromName;
-  protoOf(TypeRefImpl).m3p = create;
+  protoOf(NullRefImpl).x3o = get_object;
+  protoOf(NullRefImpl).y3o = invoke;
+  protoOf(NullRefImpl).z3o = assign;
+  protoOf(TermToObjectConverterImpl).z3p = convert;
+  protoOf(TypeFactoryImpl).c3q = typeRefFromName;
+  protoOf(TypeRefImpl).d3q = create;
   //endregion
   //region block: init
   OOP_instance = new OOP();