diff --git a/test/Demo_ABB_Opengeode/DataView.aadl b/test/Demo_ABB_Opengeode/DataView.aadl
index 36812b47cf0170542191b892ab538a895b91badd..87b516bb6355392f363d73a936fe34795775fbdd 100644
--- a/test/Demo_ABB_Opengeode/DataView.aadl
+++ b/test/Demo_ABB_Opengeode/DataView.aadl
@@ -1,7 +1,7 @@
 --------------------------------------------------------
 --! File generated by asn2aadl v2.1.41: DO NOT EDIT !
 --------------------------------------------------------
---! InputASN1FileChecksum:fc58a72b84447d6bd771ef41e6b1cb1f:/home/taste/tool-src/kazoo/test/Demo_ABB/DataView.asn:
+--! InputASN1FileChecksum:607a8809f6171272bd95da808c544429:/home/taste/tool-src/kazoo/test/Demo_ABB_Opengeode/DataView.asn:
 --! InputASN1FileChecksum:ee8a7e01f29874c0d50f437d5abb9599:/home/taste/tool-inst/share/taste-types/taste-types.asn:
 --------------------------------------------------------
 
@@ -43,16 +43,16 @@ end Stream_Element_Buffer;
 DATA Cabin_button
 PROPERTIES
     -- name of the ASN.1 source file:
-    Source_Text => ("/home/taste/tool-src/kazoo/test/Demo_ABB/DataView.asn");
+    Source_Text => ("/home/taste/tool-src/kazoo/test/Demo_ABB_Opengeode/DataView.asn");
     TASTE::Ada_Package_Name => "Lift_dataview";
     Deployment::ASN1_Module_Name => "Lift-dataview";
     Source_Language => (ASN1);
     -- Size of a buffer to cover all forms of message representation:
-    -- Real message size is 16; suggested aligned message buffer is...
-    Source_Data_Size => 16 Bytes;
+    -- Real message size is 8; suggested aligned message buffer is...
+    Source_Data_Size => 8 Bytes;
     -- name of the corresponding data type in the source file:
     Type_Source_Name => "Cabin-button";
-    TASTE::Position_In_File => [ line => 40 ; column => 1 ; ];
+    TASTE::Position_In_File => [ line => 42 ; column => 1 ; ];
     -- what kind of type is this?
     TASTE::ASN1_Basic_Type =>aCHOICE;
 END Cabin_button;
@@ -67,8 +67,8 @@ DATA IMPLEMENTATION Cabin_button_Buffer_Max.impl
     -- Buffer to hold a marshalled data of type Cabin_button
 PROPERTIES
     Data_Model::Data_Representation => array;
-    Data_Model::Dimension => (16); -- Size of the buffer
-    Source_Data_Size => 16 Bytes; -- Size of the buffer in bytes
+    Data_Model::Dimension => (8); -- Size of the buffer
+    Source_Data_Size => 8 Bytes; -- Size of the buffer in bytes
     Data_Model::Base_Type => (classifier (DataView::Stream_Element_Buffer));
 END Cabin_button_Buffer_Max.impl;
 
@@ -82,22 +82,22 @@ SUBCOMPONENTS
     Length : data Base_Types::Unsigned_32;
 PROPERTIES
     Data_Model::Data_Representation => Struct;
-    Source_Data_Size => 32 Bytes; -- Size of the buffer in bytes
+    Source_Data_Size => 24 Bytes; -- Size of the buffer in bytes
 END Cabin_button_Buffer.impl;
 
 DATA Floor_button
 PROPERTIES
     -- name of the ASN.1 source file:
-    Source_Text => ("/home/taste/tool-src/kazoo/test/Demo_ABB/DataView.asn");
+    Source_Text => ("/home/taste/tool-src/kazoo/test/Demo_ABB_Opengeode/DataView.asn");
     TASTE::Ada_Package_Name => "Lift_dataview";
     Deployment::ASN1_Module_Name => "Lift-dataview";
     Source_Language => (ASN1);
     -- Size of a buffer to cover all forms of message representation:
-    -- Real message size is 16; suggested aligned message buffer is...
-    Source_Data_Size => 16 Bytes;
+    -- Real message size is 8; suggested aligned message buffer is...
+    Source_Data_Size => 8 Bytes;
     -- name of the corresponding data type in the source file:
     Type_Source_Name => "Floor-button";
-    TASTE::Position_In_File => [ line => 35 ; column => 1 ; ];
+    TASTE::Position_In_File => [ line => 37 ; column => 1 ; ];
     -- what kind of type is this?
     TASTE::ASN1_Basic_Type =>aSEQUENCE;
 END Floor_button;
@@ -112,8 +112,8 @@ DATA IMPLEMENTATION Floor_button_Buffer_Max.impl
     -- Buffer to hold a marshalled data of type Floor_button
 PROPERTIES
     Data_Model::Data_Representation => array;
-    Data_Model::Dimension => (16); -- Size of the buffer
-    Source_Data_Size => 16 Bytes; -- Size of the buffer in bytes
+    Data_Model::Dimension => (8); -- Size of the buffer
+    Source_Data_Size => 8 Bytes; -- Size of the buffer in bytes
     Data_Model::Base_Type => (classifier (DataView::Stream_Element_Buffer));
 END Floor_button_Buffer_Max.impl;
 
@@ -127,24 +127,24 @@ SUBCOMPONENTS
     Length : data Base_Types::Unsigned_32;
 PROPERTIES
     Data_Model::Data_Representation => Struct;
-    Source_Data_Size => 32 Bytes; -- Size of the buffer in bytes
+    Source_Data_Size => 24 Bytes; -- Size of the buffer in bytes
 END Floor_button_Buffer.impl;
 
 DATA Floors
 PROPERTIES
     -- name of the ASN.1 source file:
-    Source_Text => ("/home/taste/tool-src/kazoo/test/Demo_ABB/DataView.asn");
+    Source_Text => ("/home/taste/tool-src/kazoo/test/Demo_ABB_Opengeode/DataView.asn");
     TASTE::Ada_Package_Name => "Lift_dataview";
     Deployment::ASN1_Module_Name => "Lift-dataview";
     Source_Language => (ASN1);
     -- Size of a buffer to cover all forms of message representation:
-    -- Real message size is 8; suggested aligned message buffer is...
+    -- Real message size is 4; suggested aligned message buffer is...
     Source_Data_Size => 8 Bytes;
     -- name of the corresponding data type in the source file:
     Type_Source_Name => "Floors";
-    TASTE::Position_In_File => [ line => 8 ; column => 1 ; ];
+    TASTE::Position_In_File => [ line => 10 ; column => 1 ; ];
     -- what kind of type is this?
-    TASTE::ASN1_Basic_Type =>aINTEGER;
+    TASTE::ASN1_Basic_Type =>aENUMERATED;
 END Floors;
 
 DATA IMPLEMENTATION Floors.impl
@@ -178,7 +178,7 @@ END Floors_Buffer.impl;
 DATA Lift_control
 PROPERTIES
     -- name of the ASN.1 source file:
-    Source_Text => ("/home/taste/tool-src/kazoo/test/Demo_ABB/DataView.asn");
+    Source_Text => ("/home/taste/tool-src/kazoo/test/Demo_ABB_Opengeode/DataView.asn");
     TASTE::Ada_Package_Name => "Lift_dataview";
     Deployment::ASN1_Module_Name => "Lift-dataview";
     Source_Language => (ASN1);
@@ -187,7 +187,7 @@ PROPERTIES
     Source_Data_Size => 24 Bytes;
     -- name of the corresponding data type in the source file:
     Type_Source_Name => "Lift-control";
-    TASTE::Position_In_File => [ line => 19 ; column => 1 ; ];
+    TASTE::Position_In_File => [ line => 21 ; column => 1 ; ];
     -- what kind of type is this?
     TASTE::ASN1_Basic_Type =>aSEQUENCE;
 END Lift_control;
@@ -223,7 +223,7 @@ END Lift_control_Buffer.impl;
 DATA Lift_sensor
 PROPERTIES
     -- name of the ASN.1 source file:
-    Source_Text => ("/home/taste/tool-src/kazoo/test/Demo_ABB/DataView.asn");
+    Source_Text => ("/home/taste/tool-src/kazoo/test/Demo_ABB_Opengeode/DataView.asn");
     TASTE::Ada_Package_Name => "Lift_dataview";
     Deployment::ASN1_Module_Name => "Lift-dataview";
     Source_Language => (ASN1);
@@ -232,7 +232,7 @@ PROPERTIES
     Source_Data_Size => 16 Bytes;
     -- name of the corresponding data type in the source file:
     Type_Source_Name => "Lift-sensor";
-    TASTE::Position_In_File => [ line => 26 ; column => 1 ; ];
+    TASTE::Position_In_File => [ line => 28 ; column => 1 ; ];
     -- what kind of type is this?
     TASTE::ASN1_Basic_Type =>aSEQUENCE;
 END Lift_sensor;
@@ -268,7 +268,7 @@ END Lift_sensor_Buffer.impl;
 DATA OnOff
 PROPERTIES
     -- name of the ASN.1 source file:
-    Source_Text => ("/home/taste/tool-src/kazoo/test/Demo_ABB/DataView.asn");
+    Source_Text => ("/home/taste/tool-src/kazoo/test/Demo_ABB_Opengeode/DataView.asn");
     TASTE::Ada_Package_Name => "Lift_dataview";
     Deployment::ASN1_Module_Name => "Lift-dataview";
     Source_Language => (ASN1);
@@ -313,7 +313,7 @@ END OnOff_Buffer.impl;
 DATA OpenClose
 PROPERTIES
     -- name of the ASN.1 source file:
-    Source_Text => ("/home/taste/tool-src/kazoo/test/Demo_ABB/DataView.asn");
+    Source_Text => ("/home/taste/tool-src/kazoo/test/Demo_ABB_Opengeode/DataView.asn");
     TASTE::Ada_Package_Name => "Lift_dataview";
     Deployment::ASN1_Module_Name => "Lift-dataview";
     Source_Language => (ASN1);
@@ -358,7 +358,7 @@ END OpenClose_Buffer.impl;
 DATA Position
 PROPERTIES
     -- name of the ASN.1 source file:
-    Source_Text => ("/home/taste/tool-src/kazoo/test/Demo_ABB/DataView.asn");
+    Source_Text => ("/home/taste/tool-src/kazoo/test/Demo_ABB_Opengeode/DataView.asn");
     TASTE::Ada_Package_Name => "Lift_dataview";
     Deployment::ASN1_Module_Name => "Lift-dataview";
     Source_Language => (ASN1);
@@ -403,7 +403,7 @@ END Position_Buffer.impl;
 DATA Start_condition
 PROPERTIES
     -- name of the ASN.1 source file:
-    Source_Text => ("/home/taste/tool-src/kazoo/test/Demo_ABB/DataView.asn");
+    Source_Text => ("/home/taste/tool-src/kazoo/test/Demo_ABB_Opengeode/DataView.asn");
     TASTE::Ada_Package_Name => "Lift_dataview";
     Deployment::ASN1_Module_Name => "Lift-dataview";
     Source_Language => (ASN1);
@@ -412,7 +412,7 @@ PROPERTIES
     Source_Data_Size => 16 Bytes;
     -- name of the corresponding data type in the source file:
     Type_Source_Name => "Start-condition";
-    TASTE::Position_In_File => [ line => 45 ; column => 1 ; ];
+    TASTE::Position_In_File => [ line => 47 ; column => 1 ; ];
     -- what kind of type is this?
     TASTE::ASN1_Basic_Type =>aCHOICE;
 END Start_condition;
@@ -448,7 +448,7 @@ END Start_condition_Buffer.impl;
 DATA Status
 PROPERTIES
     -- name of the ASN.1 source file:
-    Source_Text => ("/home/taste/tool-src/kazoo/test/Demo_ABB/DataView.asn");
+    Source_Text => ("/home/taste/tool-src/kazoo/test/Demo_ABB_Opengeode/DataView.asn");
     TASTE::Ada_Package_Name => "Lift_dataview";
     Deployment::ASN1_Module_Name => "Lift-dataview";
     Source_Language => (ASN1);
@@ -457,7 +457,7 @@ PROPERTIES
     Source_Data_Size => 24 Bytes;
     -- name of the corresponding data type in the source file:
     Type_Source_Name => "Status";
-    TASTE::Position_In_File => [ line => 50 ; column => 1 ; ];
+    TASTE::Position_In_File => [ line => 52 ; column => 1 ; ];
     -- what kind of type is this?
     TASTE::ASN1_Basic_Type =>aSEQUENCE;
 END Status;
@@ -718,7 +718,7 @@ END T_UInt8_Buffer.impl;
 DATA UpDown
 PROPERTIES
     -- name of the ASN.1 source file:
-    Source_Text => ("/home/taste/tool-src/kazoo/test/Demo_ABB/DataView.asn");
+    Source_Text => ("/home/taste/tool-src/kazoo/test/Demo_ABB_Opengeode/DataView.asn");
     TASTE::Ada_Package_Name => "Lift_dataview";
     Deployment::ASN1_Module_Name => "Lift-dataview";
     Source_Language => (ASN1);