diff --git a/packages/corto/lang/test/cbinding/anonymous/src/anonymous.c b/packages/corto/lang/test/cbinding/anonymous/src/anonymous.c
index 118346ea..ec9bb3b9 100644
--- a/packages/corto/lang/test/cbinding/anonymous/src/anonymous.c
+++ b/packages/corto/lang/test/cbinding/anonymous/src/anonymous.c
@@ -2,8 +2,8 @@
  *
  * anonymous.c
  *
- * Code written between the begin and end tags will be preserved when the
- * file is regenerated.
+ * Only code written between the begin and end tags will be preserved
+ * when the file is regenerated.
  */
 
 #include "anonymous.h"
diff --git a/packages/corto/lang/test/cbinding/any/src/any.c b/packages/corto/lang/test/cbinding/any/src/any.c
index 330a26c1..bee28bd5 100644
--- a/packages/corto/lang/test/cbinding/any/src/any.c
+++ b/packages/corto/lang/test/cbinding/any/src/any.c
@@ -2,8 +2,8 @@
  *
  * any.c
  *
- * Code written between the begin and end tags will be preserved when the
- * file is regenerated.
+ * Only code written between the begin and end tags will be preserved
+ * when the file is regenerated.
  */
 
 #include "any.h"
diff --git a/packages/corto/lang/test/cbinding/array/src/array.c b/packages/corto/lang/test/cbinding/array/src/array.c
index 9efdd11f..2b4d238e 100644
--- a/packages/corto/lang/test/cbinding/array/src/array.c
+++ b/packages/corto/lang/test/cbinding/array/src/array.c
@@ -2,8 +2,8 @@
  *
  * array.c
  *
- * Code written between the begin and end tags will be preserved when the
- * file is regenerated.
+ * Only code written between the begin and end tags will be preserved
+ * when the file is regenerated.
  */
 
 #include "array.h"
diff --git a/packages/corto/lang/test/cbinding/class/src/_class.c b/packages/corto/lang/test/cbinding/class/src/_class.c
index 61269e18..7196cfd6 100644
--- a/packages/corto/lang/test/cbinding/class/src/_class.c
+++ b/packages/corto/lang/test/cbinding/class/src/_class.c
@@ -2,8 +2,8 @@
  *
  * _class.c
  *
- * Code written between the begin and end tags will be preserved when the
- * file is regenerated.
+ * Only code written between the begin and end tags will be preserved
+ * when the file is regenerated.
  */
 
 #include "_class.h"
diff --git a/packages/corto/lang/test/cbinding/class/src/class_Foo.c b/packages/corto/lang/test/cbinding/class/src/class_Foo.c
index 90cbd826..58460bb5 100644
--- a/packages/corto/lang/test/cbinding/class/src/class_Foo.c
+++ b/packages/corto/lang/test/cbinding/class/src/class_Foo.c
@@ -2,8 +2,8 @@
  *
  * class_Foo.c
  *
- * Code written between the begin and end tags will be preserved when the
- * file is regenerated.
+ * Only code written between the begin and end tags will be preserved
+ * when the file is regenerated.
  */
 
 #include "_class.h"
diff --git a/packages/corto/lang/test/cbinding/class/src/class_Inherit.c b/packages/corto/lang/test/cbinding/class/src/class_Inherit.c
index 30e226c1..b3db3800 100644
--- a/packages/corto/lang/test/cbinding/class/src/class_Inherit.c
+++ b/packages/corto/lang/test/cbinding/class/src/class_Inherit.c
@@ -2,8 +2,8 @@
  *
  * class_Inherit.c
  *
- * Code written between the begin and end tags will be preserved when the
- * file is regenerated.
+ * Only code written between the begin and end tags will be preserved
+ * when the file is regenerated.
  */
 
 #include "_class.h"
diff --git a/packages/corto/lang/test/cbinding/class/src/class_InstanceObserver.c b/packages/corto/lang/test/cbinding/class/src/class_InstanceObserver.c
index 1ff5912a..a7648e33 100644
--- a/packages/corto/lang/test/cbinding/class/src/class_InstanceObserver.c
+++ b/packages/corto/lang/test/cbinding/class/src/class_InstanceObserver.c
@@ -2,8 +2,8 @@
  *
  * class_InstanceObserver.c
  *
- * Code written between the begin and end tags will be preserved when the
- * file is regenerated.
+ * Only code written between the begin and end tags will be preserved
+ * when the file is regenerated.
  */
 
 #include "_class.h"
diff --git a/packages/corto/lang/test/cbinding/delegate/src/delegate.c b/packages/corto/lang/test/cbinding/delegate/src/delegate.c
index d12ce50d..7bb26a9c 100644
--- a/packages/corto/lang/test/cbinding/delegate/src/delegate.c
+++ b/packages/corto/lang/test/cbinding/delegate/src/delegate.c
@@ -2,8 +2,8 @@
  *
  * delegate.c
  *
- * Code written between the begin and end tags will be preserved when the
- * file is regenerated.
+ * Only code written between the begin and end tags will be preserved
+ * when the file is regenerated.
  */
 
 #include "delegate.h"
diff --git a/packages/corto/lang/test/cbinding/function/src/function.c b/packages/corto/lang/test/cbinding/function/src/function.c
index ad14a55a..e386c3c6 100644
--- a/packages/corto/lang/test/cbinding/function/src/function.c
+++ b/packages/corto/lang/test/cbinding/function/src/function.c
@@ -2,8 +2,8 @@
  *
  * function.c
  *
- * Code written between the begin and end tags will be preserved when the
- * file is regenerated.
+ * Only code written between the begin and end tags will be preserved
+ * when the file is regenerated.
  */
 
 #include "function.h"
diff --git a/packages/corto/lang/test/cbinding/interface/src/interface.c b/packages/corto/lang/test/cbinding/interface/src/interface.c
index 2daff405..f3b6a9ec 100644
--- a/packages/corto/lang/test/cbinding/interface/src/interface.c
+++ b/packages/corto/lang/test/cbinding/interface/src/interface.c
@@ -2,8 +2,8 @@
  *
  * interface.c
  *
- * Code written between the begin and end tags will be preserved when the
- * file is regenerated.
+ * Only code written between the begin and end tags will be preserved
+ * when the file is regenerated.
  */
 
 #include "interface.h"
diff --git a/packages/corto/lang/test/cbinding/list/src/list.c b/packages/corto/lang/test/cbinding/list/src/list.c
index d1f94a7b..82414f0a 100644
--- a/packages/corto/lang/test/cbinding/list/src/list.c
+++ b/packages/corto/lang/test/cbinding/list/src/list.c
@@ -2,8 +2,8 @@
  *
  * list.c
  *
- * Code written between the begin and end tags will be preserved when the
- * file is regenerated.
+ * Only code written between the begin and end tags will be preserved
+ * when the file is regenerated.
  */
 
 #include "list.h"
diff --git a/packages/corto/lang/test/cbinding/method/src/method.c b/packages/corto/lang/test/cbinding/method/src/method.c
index 233b53c3..6c52cc0f 100644
--- a/packages/corto/lang/test/cbinding/method/src/method.c
+++ b/packages/corto/lang/test/cbinding/method/src/method.c
@@ -2,8 +2,8 @@
  *
  * method.c
  *
- * Code written between the begin and end tags will be preserved when the
- * file is regenerated.
+ * Only code written between the begin and end tags will be preserved
+ * when the file is regenerated.
  */
 
 #include "method.h"
diff --git a/packages/corto/lang/test/cbinding/observer/src/observer.c b/packages/corto/lang/test/cbinding/observer/src/observer.c
index b43954f1..1cb10d9c 100644
--- a/packages/corto/lang/test/cbinding/observer/src/observer.c
+++ b/packages/corto/lang/test/cbinding/observer/src/observer.c
@@ -2,8 +2,8 @@
  *
  * observer.c
  *
- * Code written between the begin and end tags will be preserved when the
- * file is regenerated.
+ * Only code written between the begin and end tags will be preserved
+ * when the file is regenerated.
  */
 
 #include "observer.h"
diff --git a/packages/corto/lang/test/cbinding/primitive/src/primitive.c b/packages/corto/lang/test/cbinding/primitive/src/primitive.c
index 053fe294..5691d6d7 100644
--- a/packages/corto/lang/test/cbinding/primitive/src/primitive.c
+++ b/packages/corto/lang/test/cbinding/primitive/src/primitive.c
@@ -2,8 +2,8 @@
  *
  * primitive.c
  *
- * Code written between the begin and end tags will be preserved when the
- * file is regenerated.
+ * Only code written between the begin and end tags will be preserved
+ * when the file is regenerated.
  */
 
 #include "primitive.h"
diff --git a/packages/corto/lang/test/cbinding/primitive/src/primitive_Bool.c b/packages/corto/lang/test/cbinding/primitive/src/primitive_Bool.c
index 7a15fed4..4887aa49 100644
--- a/packages/corto/lang/test/cbinding/primitive/src/primitive_Bool.c
+++ b/packages/corto/lang/test/cbinding/primitive/src/primitive_Bool.c
@@ -2,8 +2,8 @@
  *
  * primitive_Bool.c
  *
- * Code written between the begin and end tags will be preserved when the
- * file is regenerated.
+ * Only code written between the begin and end tags will be preserved
+ * when the file is regenerated.
  */
 
 #include "primitive.h"
diff --git a/packages/corto/lang/test/cbinding/primitive/src/primitive_Char.c b/packages/corto/lang/test/cbinding/primitive/src/primitive_Char.c
index dc5ea62c..e010d01a 100644
--- a/packages/corto/lang/test/cbinding/primitive/src/primitive_Char.c
+++ b/packages/corto/lang/test/cbinding/primitive/src/primitive_Char.c
@@ -2,8 +2,8 @@
  *
  * primitive_Char.c
  *
- * Code written between the begin and end tags will be preserved when the
- * file is regenerated.
+ * Only code written between the begin and end tags will be preserved
+ * when the file is regenerated.
  */
 
 #include "primitive.h"
diff --git a/packages/corto/lang/test/cbinding/primitive/src/primitive_Octet.c b/packages/corto/lang/test/cbinding/primitive/src/primitive_Octet.c
index ec30807c..9537b9b4 100644
--- a/packages/corto/lang/test/cbinding/primitive/src/primitive_Octet.c
+++ b/packages/corto/lang/test/cbinding/primitive/src/primitive_Octet.c
@@ -2,8 +2,8 @@
  *
  * primitive_Octet.c
  *
- * Code written between the begin and end tags will be preserved when the
- * file is regenerated.
+ * Only code written between the begin and end tags will be preserved
+ * when the file is regenerated.
  */
 
 #include "primitive.h"
diff --git a/packages/corto/lang/test/cbinding/sequence/src/sequence.c b/packages/corto/lang/test/cbinding/sequence/src/sequence.c
index 3683a3f7..521ca847 100644
--- a/packages/corto/lang/test/cbinding/sequence/src/sequence.c
+++ b/packages/corto/lang/test/cbinding/sequence/src/sequence.c
@@ -2,8 +2,8 @@
  *
  * sequence.c
  *
- * Code written between the begin and end tags will be preserved when the
- * file is regenerated.
+ * Only code written between the begin and end tags will be preserved
+ * when the file is regenerated.
  */
 
 #include "sequence.h"
diff --git a/packages/corto/lang/test/cbinding/struct/src/_struct.c b/packages/corto/lang/test/cbinding/struct/src/_struct.c
index debac261..3dacf025 100644
--- a/packages/corto/lang/test/cbinding/struct/src/_struct.c
+++ b/packages/corto/lang/test/cbinding/struct/src/_struct.c
@@ -2,8 +2,8 @@
  *
  * _struct.c
  *
- * Code written between the begin and end tags will be preserved when the
- * file is regenerated.
+ * Only code written between the begin and end tags will be preserved
+ * when the file is regenerated.
  */
 
 #include "_struct.h"
diff --git a/packages/corto/lang/test/cbinding/virtual/src/_virtual.c b/packages/corto/lang/test/cbinding/virtual/src/_virtual.c
index c18f6175..e99e029a 100644
--- a/packages/corto/lang/test/cbinding/virtual/src/_virtual.c
+++ b/packages/corto/lang/test/cbinding/virtual/src/_virtual.c
@@ -2,8 +2,8 @@
  *
  * _virtual.c
  *
- * Code written between the begin and end tags will be preserved when the
- * file is regenerated.
+ * Only code written between the begin and end tags will be preserved
+ * when the file is regenerated.
  */
 
 #include "_virtual.h"
diff --git a/packages/corto/lang/test/src/test.c b/packages/corto/lang/test/src/test.c
index b442f0cc..7ae450df 100644
--- a/packages/corto/lang/test/src/test.c
+++ b/packages/corto/lang/test/src/test.c
@@ -2,8 +2,8 @@
  *
  * test.c
  *
- * Code written between the begin and end tags will be preserved when the
- * file is regenerated.
+ * Only code written between the begin and end tags will be preserved
+ * when the file is regenerated.
  */
 
 #include "test.h"
diff --git a/packages/corto/lang/test/src/test_Bar.c b/packages/corto/lang/test/src/test_Bar.c
index c8acb070..f0180950 100644
--- a/packages/corto/lang/test/src/test_Bar.c
+++ b/packages/corto/lang/test/src/test_Bar.c
@@ -2,8 +2,8 @@
  *
  * test_Bar.c
  *
- * Code written between the begin and end tags will be preserved when the
- * file is regenerated.
+ * Only code written between the begin and end tags will be preserved
+ * when the file is regenerated.
  */
 
 #include "test.h"
diff --git a/packages/corto/lang/test/src/test_Event.c b/packages/corto/lang/test/src/test_Event.c
index 8e6e4c94..db85a421 100644
--- a/packages/corto/lang/test/src/test_Event.c
+++ b/packages/corto/lang/test/src/test_Event.c
@@ -2,8 +2,8 @@
  *
  * test_Event.c
  *
- * Code written between the begin and end tags will be preserved when the
- * file is regenerated.
+ * Only code written between the begin and end tags will be preserved
+ * when the file is regenerated.
  */
 
 #include "test.h"
diff --git a/packages/corto/lang/test/src/test_EventTest.c b/packages/corto/lang/test/src/test_EventTest.c
index 37b3d9ec..3a5353ac 100644
--- a/packages/corto/lang/test/src/test_EventTest.c
+++ b/packages/corto/lang/test/src/test_EventTest.c
@@ -2,8 +2,8 @@
  *
  * test_EventTest.c
  *
- * Code written between the begin and end tags will be preserved when the
- * file is regenerated.
+ * Only code written between the begin and end tags will be preserved
+ * when the file is regenerated.
  */
 
 #include "test.h"
diff --git a/packages/corto/lang/test/src/test_Foo.c b/packages/corto/lang/test/src/test_Foo.c
index 980f963c..1352ee9d 100644
--- a/packages/corto/lang/test/src/test_Foo.c
+++ b/packages/corto/lang/test/src/test_Foo.c
@@ -2,8 +2,8 @@
  *
  * test_Foo.c
  *
- * Code written between the begin and end tags will be preserved when the
- * file is regenerated.
+ * Only code written between the begin and end tags will be preserved
+ * when the file is regenerated.
  */
 
 #include "test.h"
diff --git a/packages/corto/lang/test/src/test_Fullname.c b/packages/corto/lang/test/src/test_Fullname.c
index bb4d4cf7..f171dfda 100644
--- a/packages/corto/lang/test/src/test_Fullname.c
+++ b/packages/corto/lang/test/src/test_Fullname.c
@@ -2,8 +2,8 @@
  *
  * test_Fullname.c
  *
- * Code written between the begin and end tags will be preserved when the
- * file is regenerated.
+ * Only code written between the begin and end tags will be preserved
+ * when the file is regenerated.
  */
 
 #include "test.h"
diff --git a/packages/corto/lang/test/src/test_MethodResolver.c b/packages/corto/lang/test/src/test_MethodResolver.c
index 479ce08a..db00ba0c 100644
--- a/packages/corto/lang/test/src/test_MethodResolver.c
+++ b/packages/corto/lang/test/src/test_MethodResolver.c
@@ -2,8 +2,8 @@
  *
  * test_MethodResolver.c
  *
- * Code written between the begin and end tags will be preserved when the
- * file is regenerated.
+ * Only code written between the begin and end tags will be preserved
+ * when the file is regenerated.
  */
 
 #include "test.h"
diff --git a/packages/corto/lang/test/src/test_MethodTester.c b/packages/corto/lang/test/src/test_MethodTester.c
index ab09bbe2..0a399812 100644
--- a/packages/corto/lang/test/src/test_MethodTester.c
+++ b/packages/corto/lang/test/src/test_MethodTester.c
@@ -2,8 +2,8 @@
  *
  * test_MethodTester.c
  *
- * Code written between the begin and end tags will be preserved when the
- * file is regenerated.
+ * Only code written between the begin and end tags will be preserved
+ * when the file is regenerated.
  */
 
 #include "test.h"
diff --git a/packages/corto/lang/test/src/test_MethodTesterInherit.c b/packages/corto/lang/test/src/test_MethodTesterInherit.c
index 04672cf4..ae15a434 100644
--- a/packages/corto/lang/test/src/test_MethodTesterInherit.c
+++ b/packages/corto/lang/test/src/test_MethodTesterInherit.c
@@ -2,8 +2,8 @@
  *
  * test_MethodTesterInherit.c
  *
- * Code written between the begin and end tags will be preserved when the
- * file is regenerated.
+ * Only code written between the begin and end tags will be preserved
+ * when the file is regenerated.
  */
 
 #include "test.h"
diff --git a/packages/corto/lang/test/src/test_ObjectMgmt.c b/packages/corto/lang/test/src/test_ObjectMgmt.c
index 108e021e..b04172d1 100644
--- a/packages/corto/lang/test/src/test_ObjectMgmt.c
+++ b/packages/corto/lang/test/src/test_ObjectMgmt.c
@@ -2,8 +2,8 @@
  *
  * test_ObjectMgmt.c
  *
- * Code written between the begin and end tags will be preserved when the
- * file is regenerated.
+ * Only code written between the begin and end tags will be preserved
+ * when the file is regenerated.
  */
 
 #include "test.h"
@@ -802,7 +802,7 @@ corto_void _test_ObjectMgmt_tc_declareExistingWithParentState(test_ObjectMgmt th
     corto_struct s = corto_structDeclareChild(NULL, "s");
     test_assert(s != NULL);
 
-    corto_member m = corto_memberCreateChild(s, "m", corto_type(corto_uint32_o), CORTO_GLOBAL, 0, FALSE);
+    corto_member m = corto_memberCreateChild(s, "m", corto_type(corto_uint32_o), CORTO_GLOBAL);
     test_assert(m != NULL);
 
     corto_int16 ret = corto_define(s);
diff --git a/packages/corto/lang/test/src/test_Overload.c b/packages/corto/lang/test/src/test_Overload.c
index 0a868cf5..d1a80071 100644
--- a/packages/corto/lang/test/src/test_Overload.c
+++ b/packages/corto/lang/test/src/test_Overload.c
@@ -2,8 +2,8 @@
  *
  * test_Overload.c
  *
- * Code written between the begin and end tags will be preserved when the
- * file is regenerated.
+ * Only code written between the begin and end tags will be preserved
+ * when the file is regenerated.
  */
 
 #include "test.h"
diff --git a/packages/corto/lang/test/src/test_RelativeName.c b/packages/corto/lang/test/src/test_RelativeName.c
index d834291c..b86e061f 100644
--- a/packages/corto/lang/test/src/test_RelativeName.c
+++ b/packages/corto/lang/test/src/test_RelativeName.c
@@ -2,8 +2,8 @@
  *
  * test_RelativeName.c
  *
- * Code written between the begin and end tags will be preserved when the
- * file is regenerated.
+ * Only code written between the begin and end tags will be preserved
+ * when the file is regenerated.
  */
 
 #include "test.h"
diff --git a/packages/corto/lang/test/src/test_Resolver.c b/packages/corto/lang/test/src/test_Resolver.c
index a0b79628..b1eda421 100644
--- a/packages/corto/lang/test/src/test_Resolver.c
+++ b/packages/corto/lang/test/src/test_Resolver.c
@@ -2,8 +2,8 @@
  *
  * test_Resolver.c
  *
- * Code written between the begin and end tags will be preserved when the
- * file is regenerated.
+ * Only code written between the begin and end tags will be preserved
+ * when the file is regenerated.
  */
 
 #include "test.h"
diff --git a/packages/corto/lang/test/src/test_Select.c b/packages/corto/lang/test/src/test_Select.c
index 4c1dfdec..a684a79b 100644
--- a/packages/corto/lang/test/src/test_Select.c
+++ b/packages/corto/lang/test/src/test_Select.c
@@ -2,8 +2,8 @@
  *
  * test_Select.c
  *
- * Code written between the begin and end tags will be preserved when the
- * file is regenerated.
+ * Only code written between the begin and end tags will be preserved
+ * when the file is regenerated.
  */
 
 #include "test.h"