Added configuration files for Noto Active Surface (#872)

7de27f52 · Andrea Orlati · GitHub · 4b6050eb · 7de27f52 · 7de27f52
Unverified Commit 7de27f52 authored 1 year ago by Andrea Orlati Committed by GitHub 1 year ago
--- a/Common/Servers/ActiveSurfaceLan/src/.lanImpl.cpp.swo
+++ b/Common/Servers/ActiveSurfaceLan/src/.lanImpl.cpp.swo
--- a/Common/Servers/ActiveSurfaceLan/src/lanSocket.cpp
+++ b/Common/Servers/ActiveSurfaceLan/src/lanSocket.cpp
--- a/Common/Servers/ActiveSurfaceUSD/src/ActiveSurfaceUSDImpl.cpp
+++ b/Common/Servers/ActiveSurfaceUSD/src/ActiveSurfaceUSDImpl.cpp
@@ -321,7 +321,7 @@ void USDImpl::reset() throw (CORBA::SystemException,ASErrors::ASErrorsEx)
    try
    {
-        _SET_CDB(calibrate, m_calibrate, "::USDImpl::reset()")
+        //_SET_CDB(calibrate, m_calibrate, "::USDImpl::reset()")
        action(RESET);
        //* restore defaults *//
@@ -589,7 +589,7 @@ void USDImpl::update(CORBA::Double elevation) throw (CORBA::SystemException, ASE
        updatePos = std::min(updatePos, m_top);
        if(updatePos == m_lastCmdStep)
            return;
-        _GET_PROP(status, m_status, "usdImpl::calibrate()")
+        _GET_PROP(status, m_status, "usdImpl::update()")
        bool running = m_status&MRUN;
        if(running)
            return;

--- a/Noto/CDB/MACI/Components/AS/SECTOR01/LAN01/LAN01.xml
+++ b/Noto/CDB/MACI/Components/AS/SECTOR01/LAN01/LAN01.xml
@@ -4,11 +4,11 @@
       xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" 
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       Name="LAN01"    Code="lanImpl"  Type="IDL:alma/ActiveSurface/lan:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp">
-      <_ Name="USD01"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD01"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
 </HierarchicalComponent>
--- a/Noto/CDB/MACI/Components/AS/SECTOR01/LAN02/LAN02.xml
+++ b/Noto/CDB/MACI/Components/AS/SECTOR01/LAN02/LAN02.xml
@@ -4,10 +4,10 @@
       xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" 
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       Name="LAN02"    Code="lanImpl"  Type="IDL:alma/ActiveSurface/lan:1.0" Container="NotoActiveSurfaceContainer01" ImplLang="cpp">
-      <_ Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
 </HierarchicalComponent>
--- a/Noto/CDB/MACI/Components/AS/SECTOR01/LAN03/LAN03.xml
+++ b/Noto/CDB/MACI/Components/AS/SECTOR01/LAN03/LAN03.xml
@@ -4,11 +4,11 @@
       xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" 
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       Name="LAN03"    Code="lanImpl"  Type="IDL:alma/ActiveSurface/lan:1.0" Container="NotoActiveSurfaceContainer01" ImplLang="cpp">
-      <_ Name="USD01"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD01"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
 </HierarchicalComponent>
--- a/Noto/CDB/MACI/Components/AS/SECTOR01/LAN04/LAN04.xml
+++ b/Noto/CDB/MACI/Components/AS/SECTOR01/LAN04/LAN04.xml
@@ -4,10 +4,10 @@
       xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" 
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       Name="LAN04"    Code="lanImpl"  Type="IDL:alma/ActiveSurface/lan:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp">
-      <_ Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
 </HierarchicalComponent>
--- a/Noto/CDB/MACI/Components/AS/SECTOR01/LAN05/LAN05.xml
+++ b/Noto/CDB/MACI/Components/AS/SECTOR01/LAN05/LAN05.xml
@@ -4,11 +4,11 @@
       xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" 
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       Name="LAN05"    Code="lanImpl"  Type="IDL:alma/ActiveSurface/lan:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp">
-      <_ Name="USD01"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD01"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
 </HierarchicalComponent>
--- a/Noto/CDB/MACI/Components/AS/SECTOR01/LAN06/LAN06.xml
+++ b/Noto/CDB/MACI/Components/AS/SECTOR01/LAN06/LAN06.xml
@@ -4,10 +4,10 @@
       xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" 
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       Name="LAN06"    Code="lanImpl"  Type="IDL:alma/ActiveSurface/lan:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp">
-      <_ Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
 </HierarchicalComponent>
--- a/Noto/CDB/MACI/Components/AS/SECTOR01/LAN07/LAN07.xml
+++ b/Noto/CDB/MACI/Components/AS/SECTOR01/LAN07/LAN07.xml
@@ -4,12 +4,12 @@
       xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" 
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       Name="LAN07"    Code="lanImpl"  Type="IDL:alma/ActiveSurface/lan:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp">
-      <_ Name="USD01"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD01"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD07"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD07"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
 </HierarchicalComponent>
--- a/Noto/CDB/MACI/Components/AS/SECTOR01/LAN08/LAN08.xml
+++ b/Noto/CDB/MACI/Components/AS/SECTOR01/LAN08/LAN08.xml
@@ -4,10 +4,10 @@
       xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" 
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       Name="LAN08"    Code="lanImpl"  Type="IDL:alma/ActiveSurface/lan:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp">
-      <_ Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
 </HierarchicalComponent>
--- a/Noto/CDB/MACI/Components/AS/SECTOR01/LAN09/LAN09.xml
+++ b/Noto/CDB/MACI/Components/AS/SECTOR01/LAN09/LAN09.xml
@@ -4,11 +4,11 @@
       xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" 
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       Name="LAN09"    Code="lanImpl"  Type="IDL:alma/ActiveSurface/lan:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp">
-      <_ Name="USD01"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD01"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
 </HierarchicalComponent>
--- a/Noto/CDB/MACI/Components/AS/SECTOR01/LAN10/LAN10.xml
+++ b/Noto/CDB/MACI/Components/AS/SECTOR01/LAN10/LAN10.xml
@@ -4,10 +4,10 @@
       xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" 
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       Name="LAN10"    Code="lanImpl"  Type="IDL:alma/ActiveSurface/lan:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp">
-      <_ Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
 </HierarchicalComponent>
--- a/Noto/CDB/MACI/Components/AS/SECTOR01/LAN11/LAN11.xml
+++ b/Noto/CDB/MACI/Components/AS/SECTOR01/LAN11/LAN11.xml
@@ -4,11 +4,11 @@
       xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" 
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       Name="LAN11"    Code="lanImpl"  Type="IDL:alma/ActiveSurface/lan:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp">
-      <_ Name="USD01"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD01"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
 </HierarchicalComponent>
--- a/Noto/CDB/MACI/Components/AS/SECTOR01/LAN12/LAN12.xml
+++ b/Noto/CDB/MACI/Components/AS/SECTOR01/LAN12/LAN12.xml
@@ -4,10 +4,10 @@
       xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" 
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       Name="LAN12"    Code="lanImpl"  Type="IDL:alma/ActiveSurface/lan:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp">
-      <_ Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer01" ImplLang="cpp"/>
 </HierarchicalComponent>
--- a/Noto/CDB/MACI/Components/AS/SECTOR02/LAN01/LAN01.xml
+++ b/Noto/CDB/MACI/Components/AS/SECTOR02/LAN01/LAN01.xml
@@ -4,11 +4,11 @@
       xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" 
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       Name="LAN01"    Code="lanImpl"  Type="IDL:alma/ActiveSurface/lan:1.0"	Container="NotoActiveSurfaceContainer02" ImplLang="cpp">
-      <_ Name="USD01"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD01"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer02" ImplLang="cpp"/>
 </HierarchicalComponent>
--- a/Noto/CDB/MACI/Components/AS/SECTOR02/LAN02/LAN02.xml
+++ b/Noto/CDB/MACI/Components/AS/SECTOR02/LAN02/LAN02.xml
@@ -4,10 +4,10 @@
       xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" 
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       Name="LAN02"    Code="lanImpl"  Type="IDL:alma/ActiveSurface/lan:1.0" Container="NotoActiveSurfaceContainer02" ImplLang="cpp">
-      <_ Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer02" ImplLang="cpp"/>
 </HierarchicalComponent>
--- a/Noto/CDB/MACI/Components/AS/SECTOR02/LAN03/LAN03.xml
+++ b/Noto/CDB/MACI/Components/AS/SECTOR02/LAN03/LAN03.xml
@@ -4,11 +4,11 @@
       xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" 
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       Name="LAN03"    Code="lanImpl"  Type="IDL:alma/ActiveSurface/lan:1.0" Container="NotoActiveSurfaceContainer02" ImplLang="cpp">
-      <_ Name="USD01"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD01"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer02" ImplLang="cpp"/>
 </HierarchicalComponent>
--- a/Noto/CDB/MACI/Components/AS/SECTOR02/LAN04/LAN04.xml
+++ b/Noto/CDB/MACI/Components/AS/SECTOR02/LAN04/LAN04.xml
@@ -4,10 +4,10 @@
       xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" 
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       Name="LAN04"    Code="lanImpl"  Type="IDL:alma/ActiveSurface/lan:1.0"	Container="NotoActiveSurfaceContainer02" ImplLang="cpp">
-      <_ Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer02" ImplLang="cpp"/>
 </HierarchicalComponent>
--- a/Noto/CDB/MACI/Components/AS/SECTOR02/LAN05/LAN05.xml
+++ b/Noto/CDB/MACI/Components/AS/SECTOR02/LAN05/LAN05.xml
@@ -4,11 +4,11 @@
       xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" 
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       Name="LAN05"    Code="lanImpl"  Type="IDL:alma/ActiveSurface/lan:1.0"	Container="NotoActiveSurfaceContainer02" ImplLang="cpp">
-      <_ Name="USD01"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD01"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="NotoActiveSurfaceContainer02" ImplLang="cpp"/>
 </HierarchicalComponent>