diff --git a/conformance_test/xml_tests/positive_tests/ATS/xsd_converted/UsefulTtcn3Types.ttcn b/conformance_test/xml_tests/positive_tests/ATS/xsd_converted/UsefulTtcn3Types.ttcn
index 7eaddb5aecd02289ae0003245377387e27b97721..eb0ecbba7f5281a65f0460ffba3b63de3c8e8f48 100644
--- a/conformance_test/xml_tests/positive_tests/ATS/xsd_converted/UsefulTtcn3Types.ttcn
+++ b/conformance_test/xml_tests/positive_tests/ATS/xsd_converted/UsefulTtcn3Types.ttcn
@@ -21,47 +21,47 @@
 module UsefulTtcn3Types {
 
 
-    type integer byte (-128 .. 127) with { variant "/* 8 bit */" };
+    type integer byte (-128 .. 127) /*with { variant "8 bit" }*/;
 
-    type integer unsignedbyte (0 .. 255) with { variant "/*unsigned 8 bit*/" };
+    type integer unsignedbyte (0 .. 255) /*with { variant "unsigned 8 bit" }*/;
 
-    type integer short (-32768 .. 32767) with { variant "/*16 bit*/" };
+    type integer short (-32768 .. 32767) /*with { variant "16 bit" }*/;
 
-    type integer unsignedshort (0 .. 65535) with { variant "/*unsigned 16 bit*/" };
+    type integer unsignedshort (0 .. 65535) /*with { variant "unsigned 16 bit" }*/;
 
-    type integer long (-2147483648 .. 2147483647) with { variant "/*32 bit*/" };
+    type integer long (-2147483648 .. 2147483647) /*with { variant "32 bit" }*/;
 
-    type integer unsignedlong (0 .. 4294967295) with { variant "/*unsigned 32 bit*/" };
+    type integer unsignedlong (0 .. 4294967295) /*with { variant "unsigned 32 bit" }*/;
 
-    type integer longlong ( -9223372036854775808 .. 9223372036854775807 ) with { variant "/*64 bit*/" };
+    type integer longlong ( -9223372036854775808 .. 9223372036854775807 ) /*with { variant "64 bit" }*/;
 
-    type integer unsignedlonglong ( 0 .. 18446744073709551615 ) with { variant "/*unsigned 64 bit*/" };
+    type integer unsignedlonglong ( 0 .. 18446744073709551615 ) /*with { variant "unsigned 64 bit" }*/;
 
-    type float IEEE754float with { variant "/*IEEE754 float*/" };
+    type float IEEE754float /*with { variant "IEEE754 float" }*/;
 
-    type float IEEE754double with { variant "/*IEEE754 double*/" };
+    type float IEEE754double /*with { variant "IEEE754 double" }*/;
 
-    type float IEEE754extfloat with { variant "/*IEEE754 extended float*/" };
+    type float IEEE754extfloat /*with { variant "IEEE754 extended float" }*/;
 
-    type float IEEE754extdouble with { variant "/*IEEE754 extended double*/" };
+    type float IEEE754extdouble /*with { variant "IEEE754 extended double" }*/;
 
-    type universal charstring utf8string with { variant "/*UTF-8*/" };
+    type universal charstring utf8string /*with { variant "UTF-8" }*/;
 
-    type universal charstring bmpstring ( char ( 0,0,0,0 ) .. char ( 0,0,255,255) ) with { variant "/*UCS-2*/" };
+    type universal charstring bmpstring ( char ( 0,0,0,0 ) .. char ( 0,0,255,255) ) /*with { variant "UCS-2" }*/;
 
-    type universal charstring utf16string ( char ( 0,0,0,0 ) .. char ( 0,16,255,255) ) with { variant "/*UTF-16*/" };
+    type universal charstring utf16string ( char ( 0,0,0,0 ) .. char ( 0,16,255,255) ) /*with { variant "UTF-16" }*/;
 
-    type universal charstring iso8859string ( char ( 0,0,0,0 ) .. char ( 0,0,0,255) ) with { variant "/*8 bit*/" };
+    type universal charstring iso8859string ( char ( 0,0,0,0 ) .. char ( 0,0,0,255) ) /*with { variant "8 bit" }*/;
 
     type record IDLfixed
     {
-    	unsignedshort digits,
-    	short scale,
-    	charstring value_
+        unsignedshort digits,
+        short scale,
+        charstring value_
     }
-    with {
-    variant "/*IDL:fixed FORMAL/01-12-01 v.2.6*/";
-    };
+    /*with {
+    variant "IDL:fixed FORMAL/01-12-01 v.2.6";
+    }*/;
 
     /*
     type charstring char length (1);
diff --git a/regression_test/XML/HR49727/UsefulTtcn3Types.ttcn b/regression_test/XML/HR49727/UsefulTtcn3Types.ttcn
index adab2df692e1058279bf6cc8fdb0154cd1c76562..046bc71a7e6b69facbea26a5ee010321b033468e 100644
--- a/regression_test/XML/HR49727/UsefulTtcn3Types.ttcn
+++ b/regression_test/XML/HR49727/UsefulTtcn3Types.ttcn
@@ -21,47 +21,47 @@
 module UsefulTtcn3Types {
 
 
-    type integer byte (-128 .. 127) with { variant "/* 8 bit */" };
+    type integer byte (-128 .. 127) /*with { variant "8 bit" }*/;
 
-    type integer unsignedbyte (0 .. 255) with { variant "/*unsigned 8 bit*/" };
+    type integer unsignedbyte (0 .. 255) /*with { variant "unsigned 8 bit" }*/;
 
-    type integer short (-32768 .. 32767) with { variant "/*16 bit*/" };
+    type integer short (-32768 .. 32767) /*with { variant "16 bit" }*/;
 
-    type integer unsignedshort (0 .. 65535) with { variant "/*unsigned 16 bit*/" };
+    type integer unsignedshort (0 .. 65535) /*with { variant "unsigned 16 bit" }*/;
 
-    type integer long (-2147483648 .. 2147483647) with { variant "/*32 bit*/" };
+    type integer long (-2147483648 .. 2147483647) /*with { variant "32 bit" }*/;
 
-    type integer unsignedlong (0 .. 4294967295) with { variant "/*unsigned 32 bit*/" };
+    type integer unsignedlong (0 .. 4294967295) /*with { variant "unsigned 32 bit" }*/;
 
-    type integer longlong /* (  -9223372036854775808 .. 9223372036854775807 ) */ with { variant "/*64 bit*/" };
+    type integer longlong ( -9223372036854775808 .. 9223372036854775807 ) /*with { variant "64 bit" }*/;
 
-    type integer unsignedlonglong /* ( 0 .. 18446744073709551615 ) */ with { variant "/*unsigned 64 bit*/" };
+    type integer unsignedlonglong ( 0 .. 18446744073709551615 ) /*with { variant "unsigned 64 bit" }*/;
 
-    type float IEEE754float with { variant "/*IEEE754 float*/" };
+    type float IEEE754float /*with { variant "IEEE754 float" }*/;
 
-    type float IEEE754double with { variant "/*IEEE754 double*/" };
+    type float IEEE754double /*with { variant "IEEE754 double" }*/;
 
-    type float IEEE754extfloat with { variant "/*IEEE754 extended float*/" };
+    type float IEEE754extfloat /*with { variant "IEEE754 extended float" }*/;
 
-    type float IEEE754extdouble with { variant "/*IEEE754 extended double*/" };
+    type float IEEE754extdouble /*with { variant "IEEE754 extended double" }*/;
 
-    type universal charstring utf8string with { variant "/*UTF-8*/" };
+    type universal charstring utf8string /*with { variant "UTF-8" }*/;
 
-    type universal charstring bmpstring ( char ( 0,0,0,0 ) .. char ( 0,0,255,255) ) with { variant "/*UCS-2*/" };
+    type universal charstring bmpstring ( char ( 0,0,0,0 ) .. char ( 0,0,255,255) ) /*with { variant "UCS-2" }*/;
 
-    type universal charstring utf16string ( char ( 0,0,0,0 ) .. char ( 0,16,255,255) ) with { variant "/*UTF-16*/" };
+    type universal charstring utf16string ( char ( 0,0,0,0 ) .. char ( 0,16,255,255) ) /*with { variant "UTF-16" }*/;
 
-    type universal charstring iso8859string ( char ( 0,0,0,0 ) .. char ( 0,0,0,255) ) with { variant "/*8 bit*/" };
+    type universal charstring iso8859string ( char ( 0,0,0,0 ) .. char ( 0,0,0,255) ) /*with { variant "8 bit" }*/;
 
     type record IDLfixed
     {
-    	unsignedshort digits,
-    	short scale,
-    	charstring value_
+        unsignedshort digits,
+        short scale,
+        charstring value_
     }
-    with {
-    variant "/*IDL:fixed FORMAL/01-12-01 v.2.6*/";
-    };
+    /*with {
+    variant "IDL:fixed FORMAL/01-12-01 v.2.6";
+    }*/;
 
     /*
     type charstring char length (1);
diff --git a/regression_test/XML/UseNilLong/UsefulTtcn3Types.ttcn b/regression_test/XML/UseNilLong/UsefulTtcn3Types.ttcn
index 93d868780825b849ea064dc09b5acba2485292eb..bb0af9214a614fee6933466fad86c66df0a0560b 100644
--- a/regression_test/XML/UseNilLong/UsefulTtcn3Types.ttcn
+++ b/regression_test/XML/UseNilLong/UsefulTtcn3Types.ttcn
@@ -21,53 +21,47 @@
 module UsefulTtcn3Types {
 
 
-    type integer byte (-128 .. 127) with { variant "/* 8 bit */" };
+    type integer byte (-128 .. 127) /*with { variant "8 bit" }*/;
 
-    type integer unsignedbyte (0 .. 255) with { variant "/*unsigned 8 bit*/" };
+    type integer unsignedbyte (0 .. 255) /*with { variant "unsigned 8 bit" }*/;
 
-    type integer short (-32768 .. 32767) with { variant "/*16 bit*/" };
+    type integer short (-32768 .. 32767) /*with { variant "16 bit" }*/;
 
-    type integer unsignedshort (0 .. 65535) with { variant "/*unsigned 16 bit*/" };
+    type integer unsignedshort (0 .. 65535) /*with { variant "unsigned 16 bit" }*/;
 
-    type integer long (-2147483648 .. 2147483647) with { variant "/*32 bit*/" };
+    type integer long (-2147483648 .. 2147483647) /*with { variant "32 bit" }*/;
 
-    type integer unsignedlong (0 .. 4294967295) with { variant "/*unsigned 32 bit*/" };
-    
-    type integer fourbitinteger (0 .. 15) with { variant "/* 4 bit */" };
-    
-    type integer threebitinteger (0 .. 7) with { variant "/* 3 bit */" };
-    
-    type integer ninebitinteger (0 .. 511) with { variant "/* 9 bit */" };
+    type integer unsignedlong (0 .. 4294967295) /*with { variant "unsigned 32 bit" }*/;
 
-    type integer longlong /* (  -9223372036854775808 .. 9223372036854775807 ) */ with { variant "/*64 bit*/" };
+    type integer longlong ( -9223372036854775808 .. 9223372036854775807 ) /*with { variant "64 bit" }*/;
 
-    type integer unsignedlonglong /* ( 0 .. 18446744073709551615 ) */ with { variant "/*unsigned 64 bit*/" };
+    type integer unsignedlonglong ( 0 .. 18446744073709551615 ) /*with { variant "unsigned 64 bit" }*/;
 
-    type float IEEE754float with { variant "/*IEEE754 float*/" };
+    type float IEEE754float /*with { variant "IEEE754 float" }*/;
 
-    type float IEEE754double with { variant "/*IEEE754 double*/" };
+    type float IEEE754double /*with { variant "IEEE754 double" }*/;
 
-    type float IEEE754extfloat with { variant "/*IEEE754 extended float*/" };
+    type float IEEE754extfloat /*with { variant "IEEE754 extended float" }*/;
 
-    type float IEEE754extdouble with { variant "/*IEEE754 extended double*/" };
+    type float IEEE754extdouble /*with { variant "IEEE754 extended double" }*/;
 
-    type universal charstring utf8string with { variant "/*UTF-8*/" };
+    type universal charstring utf8string /*with { variant "UTF-8" }*/;
 
-    type universal charstring bmpstring ( char ( 0,0,0,0 ) .. char ( 0,0,255,255) ) with { variant "/*UCS-2*/" };
+    type universal charstring bmpstring ( char ( 0,0,0,0 ) .. char ( 0,0,255,255) ) /*with { variant "UCS-2" }*/;
 
-    type universal charstring utf16string ( char ( 0,0,0,0 ) .. char ( 0,16,255,255) ) with { variant "/*UTF-16*/" };
+    type universal charstring utf16string ( char ( 0,0,0,0 ) .. char ( 0,16,255,255) ) /*with { variant "UTF-16" }*/;
 
-    type universal charstring iso8859string ( char ( 0,0,0,0 ) .. char ( 0,0,0,255) ) with { variant "/*8 bit*/" };
+    type universal charstring iso8859string ( char ( 0,0,0,0 ) .. char ( 0,0,0,255) ) /*with { variant "8 bit" }*/;
 
     type record IDLfixed
     {
-    	unsignedshort digits,
-    	short scale,
-    	charstring value_
+        unsignedshort digits,
+        short scale,
+        charstring value_
     }
-    with {
-    variant "/*IDL:fixed FORMAL/01-12-01 v.2.6*/";
-    };
+    /*with {
+    variant "IDL:fixed FORMAL/01-12-01 v.2.6";
+    }*/;
 
     /*
     type charstring char length (1);
diff --git a/regression_test/XML/XmlWorkflow/Tgc/UsefulTtcn3Types.ttcn b/regression_test/XML/XmlWorkflow/Tgc/UsefulTtcn3Types.ttcn
index adab2df692e1058279bf6cc8fdb0154cd1c76562..046bc71a7e6b69facbea26a5ee010321b033468e 100644
--- a/regression_test/XML/XmlWorkflow/Tgc/UsefulTtcn3Types.ttcn
+++ b/regression_test/XML/XmlWorkflow/Tgc/UsefulTtcn3Types.ttcn
@@ -21,47 +21,47 @@
 module UsefulTtcn3Types {
 
 
-    type integer byte (-128 .. 127) with { variant "/* 8 bit */" };
+    type integer byte (-128 .. 127) /*with { variant "8 bit" }*/;
 
-    type integer unsignedbyte (0 .. 255) with { variant "/*unsigned 8 bit*/" };
+    type integer unsignedbyte (0 .. 255) /*with { variant "unsigned 8 bit" }*/;
 
-    type integer short (-32768 .. 32767) with { variant "/*16 bit*/" };
+    type integer short (-32768 .. 32767) /*with { variant "16 bit" }*/;
 
-    type integer unsignedshort (0 .. 65535) with { variant "/*unsigned 16 bit*/" };
+    type integer unsignedshort (0 .. 65535) /*with { variant "unsigned 16 bit" }*/;
 
-    type integer long (-2147483648 .. 2147483647) with { variant "/*32 bit*/" };
+    type integer long (-2147483648 .. 2147483647) /*with { variant "32 bit" }*/;
 
-    type integer unsignedlong (0 .. 4294967295) with { variant "/*unsigned 32 bit*/" };
+    type integer unsignedlong (0 .. 4294967295) /*with { variant "unsigned 32 bit" }*/;
 
-    type integer longlong /* (  -9223372036854775808 .. 9223372036854775807 ) */ with { variant "/*64 bit*/" };
+    type integer longlong ( -9223372036854775808 .. 9223372036854775807 ) /*with { variant "64 bit" }*/;
 
-    type integer unsignedlonglong /* ( 0 .. 18446744073709551615 ) */ with { variant "/*unsigned 64 bit*/" };
+    type integer unsignedlonglong ( 0 .. 18446744073709551615 ) /*with { variant "unsigned 64 bit" }*/;
 
-    type float IEEE754float with { variant "/*IEEE754 float*/" };
+    type float IEEE754float /*with { variant "IEEE754 float" }*/;
 
-    type float IEEE754double with { variant "/*IEEE754 double*/" };
+    type float IEEE754double /*with { variant "IEEE754 double" }*/;
 
-    type float IEEE754extfloat with { variant "/*IEEE754 extended float*/" };
+    type float IEEE754extfloat /*with { variant "IEEE754 extended float" }*/;
 
-    type float IEEE754extdouble with { variant "/*IEEE754 extended double*/" };
+    type float IEEE754extdouble /*with { variant "IEEE754 extended double" }*/;
 
-    type universal charstring utf8string with { variant "/*UTF-8*/" };
+    type universal charstring utf8string /*with { variant "UTF-8" }*/;
 
-    type universal charstring bmpstring ( char ( 0,0,0,0 ) .. char ( 0,0,255,255) ) with { variant "/*UCS-2*/" };
+    type universal charstring bmpstring ( char ( 0,0,0,0 ) .. char ( 0,0,255,255) ) /*with { variant "UCS-2" }*/;
 
-    type universal charstring utf16string ( char ( 0,0,0,0 ) .. char ( 0,16,255,255) ) with { variant "/*UTF-16*/" };
+    type universal charstring utf16string ( char ( 0,0,0,0 ) .. char ( 0,16,255,255) ) /*with { variant "UTF-16" }*/;
 
-    type universal charstring iso8859string ( char ( 0,0,0,0 ) .. char ( 0,0,0,255) ) with { variant "/*8 bit*/" };
+    type universal charstring iso8859string ( char ( 0,0,0,0 ) .. char ( 0,0,0,255) ) /*with { variant "8 bit" }*/;
 
     type record IDLfixed
     {
-    	unsignedshort digits,
-    	short scale,
-    	charstring value_
+        unsignedshort digits,
+        short scale,
+        charstring value_
     }
-    with {
-    variant "/*IDL:fixed FORMAL/01-12-01 v.2.6*/";
-    };
+    /*with {
+    variant "IDL:fixed FORMAL/01-12-01 v.2.6";
+    }*/;
 
     /*
     type charstring char length (1);
diff --git a/regression_test/XML/XmlWorkflow/XmlTest_xsds/UsefulTtcn3Types.ttcn b/regression_test/XML/XmlWorkflow/XmlTest_xsds/UsefulTtcn3Types.ttcn
index adab2df692e1058279bf6cc8fdb0154cd1c76562..046bc71a7e6b69facbea26a5ee010321b033468e 100644
--- a/regression_test/XML/XmlWorkflow/XmlTest_xsds/UsefulTtcn3Types.ttcn
+++ b/regression_test/XML/XmlWorkflow/XmlTest_xsds/UsefulTtcn3Types.ttcn
@@ -21,47 +21,47 @@
 module UsefulTtcn3Types {
 
 
-    type integer byte (-128 .. 127) with { variant "/* 8 bit */" };
+    type integer byte (-128 .. 127) /*with { variant "8 bit" }*/;
 
-    type integer unsignedbyte (0 .. 255) with { variant "/*unsigned 8 bit*/" };
+    type integer unsignedbyte (0 .. 255) /*with { variant "unsigned 8 bit" }*/;
 
-    type integer short (-32768 .. 32767) with { variant "/*16 bit*/" };
+    type integer short (-32768 .. 32767) /*with { variant "16 bit" }*/;
 
-    type integer unsignedshort (0 .. 65535) with { variant "/*unsigned 16 bit*/" };
+    type integer unsignedshort (0 .. 65535) /*with { variant "unsigned 16 bit" }*/;
 
-    type integer long (-2147483648 .. 2147483647) with { variant "/*32 bit*/" };
+    type integer long (-2147483648 .. 2147483647) /*with { variant "32 bit" }*/;
 
-    type integer unsignedlong (0 .. 4294967295) with { variant "/*unsigned 32 bit*/" };
+    type integer unsignedlong (0 .. 4294967295) /*with { variant "unsigned 32 bit" }*/;
 
-    type integer longlong /* (  -9223372036854775808 .. 9223372036854775807 ) */ with { variant "/*64 bit*/" };
+    type integer longlong ( -9223372036854775808 .. 9223372036854775807 ) /*with { variant "64 bit" }*/;
 
-    type integer unsignedlonglong /* ( 0 .. 18446744073709551615 ) */ with { variant "/*unsigned 64 bit*/" };
+    type integer unsignedlonglong ( 0 .. 18446744073709551615 ) /*with { variant "unsigned 64 bit" }*/;
 
-    type float IEEE754float with { variant "/*IEEE754 float*/" };
+    type float IEEE754float /*with { variant "IEEE754 float" }*/;
 
-    type float IEEE754double with { variant "/*IEEE754 double*/" };
+    type float IEEE754double /*with { variant "IEEE754 double" }*/;
 
-    type float IEEE754extfloat with { variant "/*IEEE754 extended float*/" };
+    type float IEEE754extfloat /*with { variant "IEEE754 extended float" }*/;
 
-    type float IEEE754extdouble with { variant "/*IEEE754 extended double*/" };
+    type float IEEE754extdouble /*with { variant "IEEE754 extended double" }*/;
 
-    type universal charstring utf8string with { variant "/*UTF-8*/" };
+    type universal charstring utf8string /*with { variant "UTF-8" }*/;
 
-    type universal charstring bmpstring ( char ( 0,0,0,0 ) .. char ( 0,0,255,255) ) with { variant "/*UCS-2*/" };
+    type universal charstring bmpstring ( char ( 0,0,0,0 ) .. char ( 0,0,255,255) ) /*with { variant "UCS-2" }*/;
 
-    type universal charstring utf16string ( char ( 0,0,0,0 ) .. char ( 0,16,255,255) ) with { variant "/*UTF-16*/" };
+    type universal charstring utf16string ( char ( 0,0,0,0 ) .. char ( 0,16,255,255) ) /*with { variant "UTF-16" }*/;
 
-    type universal charstring iso8859string ( char ( 0,0,0,0 ) .. char ( 0,0,0,255) ) with { variant "/*8 bit*/" };
+    type universal charstring iso8859string ( char ( 0,0,0,0 ) .. char ( 0,0,0,255) ) /*with { variant "8 bit" }*/;
 
     type record IDLfixed
     {
-    	unsignedshort digits,
-    	short scale,
-    	charstring value_
+        unsignedshort digits,
+        short scale,
+        charstring value_
     }
-    with {
-    variant "/*IDL:fixed FORMAL/01-12-01 v.2.6*/";
-    };
+    /*with {
+    variant "IDL:fixed FORMAL/01-12-01 v.2.6";
+    }*/;
 
     /*
     type charstring char length (1);
diff --git a/regression_test/XML/XmlWorkflow/src/UsefulTtcn3Types.ttcn b/regression_test/XML/XmlWorkflow/src/UsefulTtcn3Types.ttcn
index 8dda20b81a8f83be154b66b6096045b8fcd161eb..6bf93ea3d62d63685853b983d54f38dacb3075ca 100644
--- a/regression_test/XML/XmlWorkflow/src/UsefulTtcn3Types.ttcn
+++ b/regression_test/XML/XmlWorkflow/src/UsefulTtcn3Types.ttcn
@@ -21,48 +21,48 @@
 module UsefulTtcn3Types {
 
 
-    type integer byte (-128 .. 127) with { variant "/* 8 bit */" };
+    type integer byte (-128 .. 127) /*with { variant "8 bit" }*/;
 
-    type integer unsignedbyte (0 .. 255) with { variant "/*unsigned 8 bit*/" };
+    type integer unsignedbyte (0 .. 255) /*with { variant "unsigned 8 bit" }*/;
 
-    type integer short (-32768 .. 32767) with { variant "/*16 bit*/" };
+    type integer short (-32768 .. 32767) /*with { variant "16 bit" }*/;
 
-    type integer unsignedshort (0 .. 65535) with { variant "/*unsigned 16 bit*/" };
+    type integer unsignedshort (0 .. 65535) /*with { variant "unsigned 16 bit" }*/;
 
-    type integer long (-2147483648 .. 2147483647) with { variant "/*32 bit*/" };
+    type integer long (-2147483648 .. 2147483647) /*with { variant "32 bit" }*/;
 
-    type integer unsignedlong (0 .. 4294967295) with { variant "/*unsigned 32 bit*/" };
+    type integer unsignedlong (0 .. 4294967295) /*with { variant "unsigned 32 bit" }*/;
 
-    type integer longlong /* (  -9223372036854775808 .. 9223372036854775807 ) */ with { variant "/*64 bit*/" };
+    type integer longlong ( -9223372036854775808 .. 9223372036854775807 ) /*with { variant "64 bit" }*/;
 
-    type integer unsignedlonglong /* ( 0 .. 18446744073709551615 ) */ with { variant "/*unsigned 64 bit*/" };
+    type integer unsignedlonglong ( 0 .. 18446744073709551615 ) /*with { variant "unsigned 64 bit" }*/;
 
-    type float IEEE754float with { variant "/*IEEE754 float*/" };
+    type float IEEE754float /*with { variant "IEEE754 float" }*/;
 
-    type float IEEE754double with { variant "/*IEEE754 double*/" };
+    type float IEEE754double /*with { variant "IEEE754 double" }*/;
 
-    type float IEEE754extfloat with { variant "/*IEEE754 extended float*/" };
+    type float IEEE754extfloat /*with { variant "IEEE754 extended float" }*/;
 
-    type float IEEE754extdouble with { variant "/*IEEE754 extended double*/" };
+    type float IEEE754extdouble /*with { variant "IEEE754 extended double" }*/;
 
-    type universal charstring utf8string with { variant "/*UTF-8*/" };
+    type universal charstring utf8string /*with { variant "UTF-8" }*/;
 
-    type universal charstring bmpstring ( char ( 0,0,0,0 ) .. char ( 0,0,255,255) ) with { variant "/*UCS-2*/" };
+    type universal charstring bmpstring ( char ( 0,0,0,0 ) .. char ( 0,0,255,255) ) /*with { variant "UCS-2" }*/;
 
-    type universal charstring utf16string ( char ( 0,0,0,0 ) .. char ( 0,16,255,255) ) with { variant "/*UTF-16*/" };
+    type universal charstring utf16string ( char ( 0,0,0,0 ) .. char ( 0,16,255,255) ) /*with { variant "UTF-16" }*/;
 
-    type universal charstring iso8859string ( char ( 0,0,0,0 ) .. char ( 0,0,0,255) ) with { variant "/*8 bit*/" };
+    type universal charstring iso8859string ( char ( 0,0,0,0 ) .. char ( 0,0,0,255) ) /*with { variant "8 bit" }*/;
 
     type record IDLfixed
     {
-    	unsignedshort digits,
-    	short scale,
-    	charstring value_
+        unsignedshort digits,
+        short scale,
+        charstring value_
     }
-    with {
-    variant "/*IDL:fixed FORMAL/01-12-01 v.2.6*/";
-    };
-
+    /*with {
+    variant "IDL:fixed FORMAL/01-12-01 v.2.6";
+    }*/;
+    
     /*
     type charstring char length (1);
 
diff --git a/regression_test/compileonly/readFromFile/src/UsefulTtcn3Types.ttcn b/regression_test/compileonly/readFromFile/src/UsefulTtcn3Types.ttcn
index 94cc9eb3fd94ad12f945518463f326655f0df510..b97e52811bf547d59249d11cf7a71c2216fb1c68 100644
--- a/regression_test/compileonly/readFromFile/src/UsefulTtcn3Types.ttcn
+++ b/regression_test/compileonly/readFromFile/src/UsefulTtcn3Types.ttcn
@@ -12,47 +12,47 @@
 module UsefulTtcn3Types {
 
 
-    type integer byte (-128 .. 127) with { variant "/* 8 bit */" };
+    type integer byte (-128 .. 127) /*with { variant "8 bit" }*/;
 
-    type integer unsignedbyte (0 .. 255) with { variant "/*unsigned 8 bit*/" };
+    type integer unsignedbyte (0 .. 255) /*with { variant "unsigned 8 bit" }*/;
 
-    type integer short (-32768 .. 32767) with { variant "/*16 bit*/" };
+    type integer short (-32768 .. 32767) /*with { variant "16 bit" }*/;
 
-    type integer unsignedshort (0 .. 65535) with { variant "/*unsigned 16 bit*/" };
+    type integer unsignedshort (0 .. 65535) /*with { variant "unsigned 16 bit" }*/;
 
-    type integer long (-2147483648 .. 2147483647) with { variant "/*32 bit*/" };
+    type integer long (-2147483648 .. 2147483647) /*with { variant "32 bit" }*/;
 
-    type integer unsignedlong (0 .. 4294967295) with { variant "/*unsigned 32 bit*/" };
+    type integer unsignedlong (0 .. 4294967295) /*with { variant "unsigned 32 bit" }*/;
 
-    type integer longlong /* (  -9223372036854775808 .. 9223372036854775807 ) */ with { variant "/*64 bit*/" };
+    type integer longlong ( -9223372036854775808 .. 9223372036854775807 ) /*with { variant "64 bit" }*/;
 
-    type integer unsignedlonglong /* ( 0 .. 18446744073709551615 ) */ with { variant "/*unsigned 64 bit*/" };
+    type integer unsignedlonglong ( 0 .. 18446744073709551615 ) /*with { variant "unsigned 64 bit" }*/;
 
-    type float IEEE754float with { variant "/*IEEE754 float*/" };
+    type float IEEE754float /*with { variant "IEEE754 float" }*/;
 
-    type float IEEE754double with { variant "/*IEEE754 double*/" };
+    type float IEEE754double /*with { variant "IEEE754 double" }*/;
 
-    type float IEEE754extfloat with { variant "/*IEEE754 extended float*/" };
+    type float IEEE754extfloat /*with { variant "IEEE754 extended float" }*/;
 
-    type float IEEE754extdouble with { variant "/*IEEE754 extended double*/" };
+    type float IEEE754extdouble /*with { variant "IEEE754 extended double" }*/;
 
-    type universal charstring utf8string with { variant "/*UTF-8*/" };
+    type universal charstring utf8string /*with { variant "UTF-8" }*/;
 
-    type universal charstring bmpstring ( char ( 0,0,0,0 ) .. char ( 0,0,255,255) ) with { variant "/*UCS-2*/" };
+    type universal charstring bmpstring ( char ( 0,0,0,0 ) .. char ( 0,0,255,255) ) /*with { variant "UCS-2" }*/;
 
-    type universal charstring utf16string ( char ( 0,0,0,0 ) .. char ( 0,16,255,255) ) with { variant "/*UTF-16*/" };
+    type universal charstring utf16string ( char ( 0,0,0,0 ) .. char ( 0,16,255,255) ) /*with { variant "UTF-16" }*/;
 
-    type universal charstring iso8859string ( char ( 0,0,0,0 ) .. char ( 0,0,0,255) ) with { variant "/*8 bit*/" };
+    type universal charstring iso8859string ( char ( 0,0,0,0 ) .. char ( 0,0,0,255) ) /*with { variant "8 bit" }*/;
 
     type record IDLfixed
     {
-    	unsignedshort digits,
-    	short scale,
-    	charstring value_
+        unsignedshort digits,
+        short scale,
+        charstring value_
     }
-    with {
-    variant "/*IDL:fixed FORMAL/01-12-01 v.2.6*/";
-    };
+    /*with {
+    variant "IDL:fixed FORMAL/01-12-01 v.2.6";
+    }*/;
 
     /*
     type charstring char length (1);
diff --git a/regression_test/negativeTest/UsefulTtcn3Types.ttcn b/regression_test/negativeTest/UsefulTtcn3Types.ttcn
index adab2df692e1058279bf6cc8fdb0154cd1c76562..046bc71a7e6b69facbea26a5ee010321b033468e 100644
--- a/regression_test/negativeTest/UsefulTtcn3Types.ttcn
+++ b/regression_test/negativeTest/UsefulTtcn3Types.ttcn
@@ -21,47 +21,47 @@
 module UsefulTtcn3Types {
 
 
-    type integer byte (-128 .. 127) with { variant "/* 8 bit */" };
+    type integer byte (-128 .. 127) /*with { variant "8 bit" }*/;
 
-    type integer unsignedbyte (0 .. 255) with { variant "/*unsigned 8 bit*/" };
+    type integer unsignedbyte (0 .. 255) /*with { variant "unsigned 8 bit" }*/;
 
-    type integer short (-32768 .. 32767) with { variant "/*16 bit*/" };
+    type integer short (-32768 .. 32767) /*with { variant "16 bit" }*/;
 
-    type integer unsignedshort (0 .. 65535) with { variant "/*unsigned 16 bit*/" };
+    type integer unsignedshort (0 .. 65535) /*with { variant "unsigned 16 bit" }*/;
 
-    type integer long (-2147483648 .. 2147483647) with { variant "/*32 bit*/" };
+    type integer long (-2147483648 .. 2147483647) /*with { variant "32 bit" }*/;
 
-    type integer unsignedlong (0 .. 4294967295) with { variant "/*unsigned 32 bit*/" };
+    type integer unsignedlong (0 .. 4294967295) /*with { variant "unsigned 32 bit" }*/;
 
-    type integer longlong /* (  -9223372036854775808 .. 9223372036854775807 ) */ with { variant "/*64 bit*/" };
+    type integer longlong ( -9223372036854775808 .. 9223372036854775807 ) /*with { variant "64 bit" }*/;
 
-    type integer unsignedlonglong /* ( 0 .. 18446744073709551615 ) */ with { variant "/*unsigned 64 bit*/" };
+    type integer unsignedlonglong ( 0 .. 18446744073709551615 ) /*with { variant "unsigned 64 bit" }*/;
 
-    type float IEEE754float with { variant "/*IEEE754 float*/" };
+    type float IEEE754float /*with { variant "IEEE754 float" }*/;
 
-    type float IEEE754double with { variant "/*IEEE754 double*/" };
+    type float IEEE754double /*with { variant "IEEE754 double" }*/;
 
-    type float IEEE754extfloat with { variant "/*IEEE754 extended float*/" };
+    type float IEEE754extfloat /*with { variant "IEEE754 extended float" }*/;
 
-    type float IEEE754extdouble with { variant "/*IEEE754 extended double*/" };
+    type float IEEE754extdouble /*with { variant "IEEE754 extended double" }*/;
 
-    type universal charstring utf8string with { variant "/*UTF-8*/" };
+    type universal charstring utf8string /*with { variant "UTF-8" }*/;
 
-    type universal charstring bmpstring ( char ( 0,0,0,0 ) .. char ( 0,0,255,255) ) with { variant "/*UCS-2*/" };
+    type universal charstring bmpstring ( char ( 0,0,0,0 ) .. char ( 0,0,255,255) ) /*with { variant "UCS-2" }*/;
 
-    type universal charstring utf16string ( char ( 0,0,0,0 ) .. char ( 0,16,255,255) ) with { variant "/*UTF-16*/" };
+    type universal charstring utf16string ( char ( 0,0,0,0 ) .. char ( 0,16,255,255) ) /*with { variant "UTF-16" }*/;
 
-    type universal charstring iso8859string ( char ( 0,0,0,0 ) .. char ( 0,0,0,255) ) with { variant "/*8 bit*/" };
+    type universal charstring iso8859string ( char ( 0,0,0,0 ) .. char ( 0,0,0,255) ) /*with { variant "8 bit" }*/;
 
     type record IDLfixed
     {
-    	unsignedshort digits,
-    	short scale,
-    	charstring value_
+        unsignedshort digits,
+        short scale,
+        charstring value_
     }
-    with {
-    variant "/*IDL:fixed FORMAL/01-12-01 v.2.6*/";
-    };
+    /*with {
+    variant "IDL:fixed FORMAL/01-12-01 v.2.6";
+    }*/;
 
     /*
     type charstring char length (1);
diff --git a/xsdconvert/PredefinedModules.cc b/xsdconvert/PredefinedModules.cc
index ec57aa5a392584752d22d28b5f25bd1ad0e3b434..90f380a613d6385d7bdd7bff33200a9bf3cbd315 100644
--- a/xsdconvert/PredefinedModules.cc
+++ b/xsdconvert/PredefinedModules.cc
@@ -22,37 +22,37 @@ const char * moduleUsefulTtcn3Types = {
   "module UsefulTtcn3Types {\n\n\n"
 
 
-  "    type integer byte (-128 .. 127) with { variant \"/* 8 bit */\" };\n\n"
+  "    type integer byte (-128 .. 127) /*with { variant \"8 bit\" }*/;\n\n"
 
-  "    type integer unsignedbyte (0 .. 255) with { variant \"/*unsigned 8 bit*/\" };\n\n"
+  "    type integer unsignedbyte (0 .. 255) /*with { variant \"unsigned 8 bit\" }*/;\n\n"
 
-  "    type integer short (-32768 .. 32767) with { variant \"/*16 bit*/\" };\n\n"
+  "    type integer short (-32768 .. 32767) /*with { variant \"16 bit\" }*/;\n\n"
 
-  "    type integer unsignedshort (0 .. 65535) with { variant \"/*unsigned 16 bit*/\" };\n\n"
+  "    type integer unsignedshort (0 .. 65535) /*with { variant \"unsigned 16 bit\" }*/;\n\n"
 
-  "    type integer long (-2147483648 .. 2147483647) with { variant \"/*32 bit*/\" };\n\n"
+  "    type integer long (-2147483648 .. 2147483647) /*with { variant \"32 bit\" }*/;\n\n"
 
-  "    type integer unsignedlong (0 .. 4294967295) with { variant \"/*unsigned 32 bit*/\" };\n\n"
+  "    type integer unsignedlong (0 .. 4294967295) /*with { variant \"unsigned 32 bit\" }*/;\n\n"
 
-  "    type integer longlong ( -9223372036854775808 .. 9223372036854775807 ) with { variant \"/*64 bit*/\" };\n\n"
+  "    type integer longlong ( -9223372036854775808 .. 9223372036854775807 ) /*with { variant \"64 bit\" }*/;\n\n"
 
-  "    type integer unsignedlonglong ( 0 .. 18446744073709551615 ) with { variant \"/*unsigned 64 bit*/\" };\n\n"
+  "    type integer unsignedlonglong ( 0 .. 18446744073709551615 ) /*with { variant \"unsigned 64 bit\" }*/;\n\n"
 
-  "    type float IEEE754float with { variant \"/*IEEE754 float*/\" };\n\n"
+  "    type float IEEE754float /*with { variant \"IEEE754 float\" }*/;\n\n"
 
-  "    type float IEEE754double with { variant \"/*IEEE754 double*/\" };\n\n"
+  "    type float IEEE754double /*with { variant \"IEEE754 double\" }*/;\n\n"
 
-  "    type float IEEE754extfloat with { variant \"/*IEEE754 extended float*/\" };\n\n"
+  "    type float IEEE754extfloat /*with { variant \"IEEE754 extended float\" }*/;\n\n"
 
-  "    type float IEEE754extdouble with { variant \"/*IEEE754 extended double*/\" };\n\n"
+  "    type float IEEE754extdouble /*with { variant \"IEEE754 extended double\" }*/;\n\n"
 
-  "    type universal charstring utf8string with { variant \"/*UTF-8*/\" };\n\n"
+  "    type universal charstring utf8string /*with { variant \"UTF-8\" }*/;\n\n"
 
-  "    type universal charstring bmpstring ( char ( 0,0,0,0 ) .. char ( 0,0,255,255) ) with { variant \"/*UCS-2*/\" };\n\n"
+  "    type universal charstring bmpstring ( char ( 0,0,0,0 ) .. char ( 0,0,255,255) ) /*with { variant \"UCS-2\" }*/;\n\n"
 
-  "    type universal charstring utf16string ( char ( 0,0,0,0 ) .. char ( 0,16,255,255) ) with { variant \"/*UTF-16*/\" };\n\n"
+  "    type universal charstring utf16string ( char ( 0,0,0,0 ) .. char ( 0,16,255,255) ) /*with { variant \"UTF-16\" }*/;\n\n"
 
-  "    type universal charstring iso8859string ( char ( 0,0,0,0 ) .. char ( 0,0,0,255) ) with { variant \"/*8 bit*/\" };\n\n"
+  "    type universal charstring iso8859string ( char ( 0,0,0,0 ) .. char ( 0,0,0,255) ) /*with { variant \"8 bit\" }*/;\n\n"
 
   "    type record IDLfixed\n"
   "    {\n"
@@ -60,9 +60,9 @@ const char * moduleUsefulTtcn3Types = {
   "    	short scale,\n"
   "    	charstring value_\n"
   "    }\n"
-  "    with {\n"
-  "    variant \"/*IDL:fixed FORMAL/01-12-01 v.2.6*/\";\n"
-  "    };\n\n"
+  "    /*with {\n"
+  "    variant \"IDL:fixed FORMAL/01-12-01 v.2.6\";\n"
+  "    }*/;\n\n"
 
   "    /*\n"
   "    type charstring char length (1);\n\n"