From f3ce596f15ee133a49164eaa07908fed7b17e954 Mon Sep 17 00:00:00 2001
From: Giuseppe Carboni <giuseppecarboni89@live.com>
Date: Mon, 3 Feb 2025 15:43:41 +0100
Subject: [PATCH] Fix #899, added Outdated CDBs for each station (#900)

* Reworked SRT CDBs

* Reworked Medicina CDBs

* Updated Outdated CDBs
---
 .../Components/AS/SECTOR01/LAN01/LAN01.xml    |  12 +-
 .../Components/AS/SECTOR01/LAN02/LAN02.xml    |  10 +-
 .../Components/AS/SECTOR01/LAN03/LAN03.xml    |  12 +-
 .../Components/AS/SECTOR01/LAN04/LAN04.xml    |  10 +-
 .../Components/AS/SECTOR01/LAN05/LAN05.xml    |  12 +-
 .../Components/AS/SECTOR01/LAN06/LAN06.xml    |  10 +-
 .../Components/AS/SECTOR01/LAN07/LAN07.xml    |  14 +-
 .../Components/AS/SECTOR01/LAN08/LAN08.xml    |  10 +-
 .../Components/AS/SECTOR01/LAN09/LAN09.xml    |  12 +-
 .../Components/AS/SECTOR01/LAN10/LAN10.xml    |  10 +-
 .../Components/AS/SECTOR01/LAN11/LAN11.xml    |  12 +-
 .../Components/AS/SECTOR01/LAN12/LAN12.xml    |  10 +-
 .../Components/AS/SECTOR02/LAN01/LAN01.xml    |  12 +-
 .../Components/AS/SECTOR02/LAN02/LAN02.xml    |  10 +-
 .../Components/AS/SECTOR02/LAN03/LAN03.xml    |  12 +-
 .../Components/AS/SECTOR02/LAN04/LAN04.xml    |  10 +-
 .../Components/AS/SECTOR02/LAN05/LAN05.xml    |  12 +-
 .../Components/AS/SECTOR02/LAN06/LAN06.xml    |  10 +-
 .../Components/AS/SECTOR02/LAN07/LAN07.xml    |  14 +-
 .../Components/AS/SECTOR02/LAN08/LAN08.xml    |  10 +-
 .../Components/AS/SECTOR02/LAN09/LAN09.xml    |  12 +-
 .../Components/AS/SECTOR02/LAN10/LAN10.xml    |  10 +-
 .../Components/AS/SECTOR02/LAN11/LAN11.xml    |  12 +-
 .../Components/AS/SECTOR02/LAN12/LAN12.xml    |  10 +-
 .../Components/AS/SECTOR03/LAN01/LAN01.xml    |  12 +-
 .../Components/AS/SECTOR03/LAN02/LAN02.xml    |  10 +-
 .../Components/AS/SECTOR03/LAN03/LAN03.xml    |  12 +-
 .../Components/AS/SECTOR03/LAN04/LAN04.xml    |  10 +-
 .../Components/AS/SECTOR03/LAN05/LAN05.xml    |  12 +-
 .../Components/AS/SECTOR03/LAN06/LAN06.xml    |  10 +-
 .../Components/AS/SECTOR03/LAN07/LAN07.xml    |  14 +-
 .../Components/AS/SECTOR03/LAN08/LAN08.xml    |  10 +-
 .../Components/AS/SECTOR03/LAN09/LAN09.xml    |  12 +-
 .../Components/AS/SECTOR03/LAN10/LAN10.xml    |  10 +-
 .../Components/AS/SECTOR03/LAN11/LAN11.xml    |  12 +-
 .../Components/AS/SECTOR03/LAN12/LAN12.xml    |  10 +-
 .../Components/AS/SECTOR04/LAN01/LAN01.xml    |  12 +-
 .../Components/AS/SECTOR04/LAN02/LAN02.xml    |  10 +-
 .../Components/AS/SECTOR04/LAN03/LAN03.xml    |  12 +-
 .../Components/AS/SECTOR04/LAN04/LAN04.xml    |  10 +-
 .../Components/AS/SECTOR04/LAN05/LAN05.xml    |  12 +-
 .../Components/AS/SECTOR04/LAN06/LAN06.xml    |  10 +-
 .../Components/AS/SECTOR04/LAN07/LAN07.xml    |  14 +-
 .../Components/AS/SECTOR04/LAN08/LAN08.xml    |  10 +-
 .../Components/AS/SECTOR04/LAN09/LAN09.xml    |  12 +-
 .../Components/AS/SECTOR04/LAN10/LAN10.xml    |  10 +-
 .../Components/AS/SECTOR04/LAN11/LAN11.xml    |  12 +-
 .../Components/AS/SECTOR04/LAN12/LAN12.xml    |  10 +-
 .../MedicinaActiveSurfaceContainer.xml        |   2 +-
 .../MedicinaActiveSurfaceContainer01.xml      |   2 +-
 .../MedicinaActiveSurfaceContainer02.xml      |   2 +-
 .../MedicinaActiveSurfaceContainer03.xml      |   2 +-
 .../MedicinaActiveSurfaceContainer04.xml      |   2 +-
 Medicina/CDB/alma/AS/Boss/Boss.xml            |   4 +-
 .../Components/AS/SECTOR01/LAN01/LAN01.xml    |  12 +-
 .../Components/AS/SECTOR01/LAN02/LAN02.xml    |  10 +-
 .../Components/AS/SECTOR01/LAN03/LAN03.xml    |  12 +-
 .../Components/AS/SECTOR01/LAN04/LAN04.xml    |  10 +-
 .../Components/AS/SECTOR01/LAN05/LAN05.xml    |  12 +-
 .../Components/AS/SECTOR01/LAN06/LAN06.xml    |  10 +-
 .../Components/AS/SECTOR01/LAN07/LAN07.xml    |  14 +-
 .../Components/AS/SECTOR01/LAN08/LAN08.xml    |  10 +-
 .../Components/AS/SECTOR01/LAN09/LAN09.xml    |  12 +-
 .../Components/AS/SECTOR01/LAN10/LAN10.xml    |  10 +-
 .../Components/AS/SECTOR01/LAN11/LAN11.xml    |  12 +-
 .../Components/AS/SECTOR01/LAN12/LAN12.xml    |  10 +-
 .../Components/AS/SECTOR02/LAN01/LAN01.xml    |  12 +-
 .../Components/AS/SECTOR02/LAN02/LAN02.xml    |  10 +-
 .../Components/AS/SECTOR02/LAN03/LAN03.xml    |  12 +-
 .../Components/AS/SECTOR02/LAN04/LAN04.xml    |  10 +-
 .../Components/AS/SECTOR02/LAN05/LAN05.xml    |  12 +-
 .../Components/AS/SECTOR02/LAN06/LAN06.xml    |  10 +-
 .../Components/AS/SECTOR02/LAN07/LAN07.xml    |  14 +-
 .../Components/AS/SECTOR02/LAN08/LAN08.xml    |  10 +-
 .../Components/AS/SECTOR02/LAN09/LAN09.xml    |  12 +-
 .../Components/AS/SECTOR02/LAN10/LAN10.xml    |  10 +-
 .../Components/AS/SECTOR02/LAN11/LAN11.xml    |  12 +-
 .../Components/AS/SECTOR02/LAN12/LAN12.xml    |  10 +-
 .../Components/AS/SECTOR03/LAN01/LAN01.xml    |  12 +-
 .../Components/AS/SECTOR03/LAN02/LAN02.xml    |  10 +-
 .../Components/AS/SECTOR03/LAN03/LAN03.xml    |  12 +-
 .../Components/AS/SECTOR03/LAN04/LAN04.xml    |  10 +-
 .../Components/AS/SECTOR03/LAN05/LAN05.xml    |  12 +-
 .../Components/AS/SECTOR03/LAN06/LAN06.xml    |  10 +-
 .../Components/AS/SECTOR03/LAN07/LAN07.xml    |  14 +-
 .../Components/AS/SECTOR03/LAN08/LAN08.xml    |  10 +-
 .../Components/AS/SECTOR03/LAN09/LAN09.xml    |  12 +-
 .../Components/AS/SECTOR03/LAN10/LAN10.xml    |  10 +-
 .../Components/AS/SECTOR03/LAN11/LAN11.xml    |  12 +-
 .../Components/AS/SECTOR03/LAN12/LAN12.xml    |  10 +-
 .../Components/AS/SECTOR04/LAN01/LAN01.xml    |  12 +-
 .../Components/AS/SECTOR04/LAN02/LAN02.xml    |  10 +-
 .../Components/AS/SECTOR04/LAN03/LAN03.xml    |  12 +-
 .../Components/AS/SECTOR04/LAN04/LAN04.xml    |  10 +-
 .../Components/AS/SECTOR04/LAN05/LAN05.xml    |  12 +-
 .../Components/AS/SECTOR04/LAN06/LAN06.xml    |  10 +-
 .../Components/AS/SECTOR04/LAN07/LAN07.xml    |  14 +-
 .../Components/AS/SECTOR04/LAN08/LAN08.xml    |  10 +-
 .../Components/AS/SECTOR04/LAN09/LAN09.xml    |  12 +-
 .../Components/AS/SECTOR04/LAN10/LAN10.xml    |  10 +-
 .../Components/AS/SECTOR04/LAN11/LAN11.xml    |  12 +-
 .../Components/AS/SECTOR04/LAN12/LAN12.xml    |  10 +-
 .../MedicinaActiveSurfaceContainer.xml        |   2 +-
 .../MedicinaActiveSurfaceContainer01.xml      |   2 +-
 .../MedicinaActiveSurfaceContainer02.xml      |   2 +-
 .../MedicinaActiveSurfaceContainer03.xml      |   2 +-
 .../MedicinaActiveSurfaceContainer04.xml      |   2 +-
 Medicina/Outdated/CDB/MACI/.gitignore         |   1 +
 Medicina/Outdated/CDB/alma/.gitignore         |   1 +
 .../NoiseGenerator/NoiseGenerator.xml         |   0
 Noto/Outdated/CDB/MACI/.gitignore             |   1 +
 Noto/Outdated/CDB/alma/.gitignore             |   1 +
 SRT/CDB/alma/BACKENDS/XBackends/XBackends.xml |  32 --
 .../SRTLPBandReceiver/NoiseMark/NoiseMark.xml |  34 --
 SRT/CDB/alma/MINORSERVO/PFP/PFP.xml           |  41 --
 SRT/CDB/alma/RECEIVERS/LO1/LO1.xml            |  10 -
 SRT/CDB/alma/RECEIVERS/LO_LP/LO_LP.xml        |  11 -
 .../SRTIFDistributor/SRTIFDistributor.xml     |  13 -
 .../SRTLPBandReceiver/SRTLPBandReceiver.xml   | 456 ------------------
 .../NoiseGenerator/NoiseGenerator.xml         |  29 --
 .../NoiseGenerator/NoiseGenerator.xml         |  29 --
 .../Configuration/Configuration.xml           |  61 ---
 .../SRTLPBandReceiver/Feeds/Feeds.xml         |  21 -
 .../SRTLPBandReceiver/Modes/C1C1/C1C1.xml     |  28 --
 .../SRTLPBandReceiver/Modes/C1C2/C1C2.xml     |  28 --
 .../SRTLPBandReceiver/Modes/C1C3/C1C3.xml     |  28 --
 .../SRTLPBandReceiver/Modes/C1C4/C1C4.xml     |  28 --
 .../SRTLPBandReceiver/Modes/C1C5/C1C5.xml     |  28 --
 .../SRTLPBandReceiver/Modes/C1L1/C1L1.xml     |  28 --
 .../SRTLPBandReceiver/Modes/C1L2/C1L2.xml     |  28 --
 .../SRTLPBandReceiver/Modes/C1L3/C1L3.xml     |  28 --
 .../SRTLPBandReceiver/Modes/C1L4/C1L4.xml     |  28 --
 .../SRTLPBandReceiver/Modes/C1L5/C1L5.xml     |  28 --
 .../SRTLPBandReceiver/Modes/C1XX/C1XX.xml     |  28 --
 .../SRTLPBandReceiver/Modes/C2C1/C2C1.xml     |  28 --
 .../SRTLPBandReceiver/Modes/C2C2/C2C2.xml     |  28 --
 .../SRTLPBandReceiver/Modes/C2C3/C2C3.xml     |  28 --
 .../SRTLPBandReceiver/Modes/C2C4/C2C4.xml     |  28 --
 .../SRTLPBandReceiver/Modes/C2C5/C2C5.xml     |  28 --
 .../SRTLPBandReceiver/Modes/C2L1/C2L1.xml     |  28 --
 .../SRTLPBandReceiver/Modes/C2L2/C2L2.xml     |  28 --
 .../SRTLPBandReceiver/Modes/C2L3/C2L3.xml     |  28 --
 .../SRTLPBandReceiver/Modes/C2L4/C2L4.xml     |  28 --
 .../SRTLPBandReceiver/Modes/C2L5/C2L5.xml     |  28 --
 .../SRTLPBandReceiver/Modes/C2XX/C2XX.xml     |  28 --
 .../SRTLPBandReceiver/Modes/C3C1/C3C1.xml     |  28 --
 .../SRTLPBandReceiver/Modes/C3C2/C3C2.xml     |  28 --
 .../SRTLPBandReceiver/Modes/C3C3/C3C3.xml     |  28 --
 .../SRTLPBandReceiver/Modes/C3C4/C3C4.xml     |  28 --
 .../SRTLPBandReceiver/Modes/C3C5/C3C5.xml     |  28 --
 .../SRTLPBandReceiver/Modes/C3L1/C3L1.xml     |  28 --
 .../SRTLPBandReceiver/Modes/C3L2/C3L2.xml     |  28 --
 .../SRTLPBandReceiver/Modes/C3L3/C3L3.xml     |  28 --
 .../SRTLPBandReceiver/Modes/C3L4/C3L4.xml     |  28 --
 .../SRTLPBandReceiver/Modes/C3L5/C3L5.xml     |  28 --
 .../SRTLPBandReceiver/Modes/C3XX/C3XX.xml     |  28 --
 .../SRTLPBandReceiver/Modes/L1C1/L1C1.xml     |  28 --
 .../SRTLPBandReceiver/Modes/L1C2/L1C2.xml     |  28 --
 .../SRTLPBandReceiver/Modes/L1C3/L1C3.xml     |  28 --
 .../SRTLPBandReceiver/Modes/L1C4/L1C4.xml     |  28 --
 .../SRTLPBandReceiver/Modes/L1C5/L1C5.xml     |  28 --
 .../SRTLPBandReceiver/Modes/L1L1/L1L1.xml     |  28 --
 .../SRTLPBandReceiver/Modes/L1L2/L1L2.xml     |  28 --
 .../SRTLPBandReceiver/Modes/L1L3/L1L3.xml     |  28 --
 .../SRTLPBandReceiver/Modes/L1L4/L1L4.xml     |  28 --
 .../SRTLPBandReceiver/Modes/L1L5/L1L5.xml     |  28 --
 .../SRTLPBandReceiver/Modes/L1XX/L1XX.xml     |  28 --
 .../SRTLPBandReceiver/Modes/L2C1/L2C1.xml     |  28 --
 .../SRTLPBandReceiver/Modes/L2C2/L2C2.xml     |  28 --
 .../SRTLPBandReceiver/Modes/L2C3/L2C3.xml     |  28 --
 .../SRTLPBandReceiver/Modes/L2C4/L2C4.xml     |  28 --
 .../SRTLPBandReceiver/Modes/L2C5/L2C5.xml     |  28 --
 .../SRTLPBandReceiver/Modes/L2L1/L2L1.xml     |  28 --
 .../SRTLPBandReceiver/Modes/L2L2/L2L2.xml     |  28 --
 .../SRTLPBandReceiver/Modes/L2L3/L2L3.xml     |  28 --
 .../SRTLPBandReceiver/Modes/L2L4/L2L4.xml     |  28 --
 .../SRTLPBandReceiver/Modes/L2L5/L2L5.xml     |  28 --
 .../SRTLPBandReceiver/Modes/L2XX/L2XX.xml     |  28 --
 .../SRTLPBandReceiver/Modes/L3C1/L3C1.xml     |  28 --
 .../SRTLPBandReceiver/Modes/L3C2/L3C2.xml     |  28 --
 .../SRTLPBandReceiver/Modes/L3C3/L3C3.xml     |  28 --
 .../SRTLPBandReceiver/Modes/L3C4/L3C4.xml     |  28 --
 .../SRTLPBandReceiver/Modes/L3C5/L3C5.xml     |  28 --
 .../SRTLPBandReceiver/Modes/L3L1/L3L1.xml     |  28 --
 .../SRTLPBandReceiver/Modes/L3L2/L3L2.xml     |  28 --
 .../SRTLPBandReceiver/Modes/L3L3/L3L3.xml     |  28 --
 .../SRTLPBandReceiver/Modes/L3L4/L3L4.xml     |  28 --
 .../SRTLPBandReceiver/Modes/L3L5/L3L5.xml     |  28 --
 .../SRTLPBandReceiver/Modes/L3XX/L3XX.xml     |  28 --
 .../SRTLPBandReceiver/Modes/XXC1/XXC1.xml     |  28 --
 .../SRTLPBandReceiver/Modes/XXC2/XXC2.xml     |  28 --
 .../SRTLPBandReceiver/Modes/XXC3/XXC3.xml     |  28 --
 .../SRTLPBandReceiver/Modes/XXC4/XXC4.xml     |  28 --
 .../SRTLPBandReceiver/Modes/XXC5/XXC5.xml     |  28 --
 .../SRTLPBandReceiver/Modes/XXL1/XXL1.xml     |  28 --
 .../SRTLPBandReceiver/Modes/XXL2/XXL2.xml     |  28 --
 .../SRTLPBandReceiver/Modes/XXL3/XXL3.xml     |  28 --
 .../SRTLPBandReceiver/Modes/XXL4/XXL4.xml     |  28 --
 .../SRTLPBandReceiver/Modes/XXL5/XXL5.xml     |  28 --
 .../SRTLPBandReceiver/Modes/make_modes.py     | 208 --------
 .../Synthesizer/Synthesizer.xml               |  22 -
 .../SRTLPBandReceiver/Taper/Taper.xml         |  16 -
 SRT/Outdated/CDB/MACI/.gitignore              |   1 +
 .../MACI/Components/BACKENDS/DXC2/DXC2.xml    |   0
 .../BACKENDS/Holography/Holography.xml        |   0
 .../NoiseGenerator/NoiseGenerator.xml         |   0
 .../BACKENDS/XBackends/XBackends.xml          |   0
 .../MACI/Components/MINORSERVO/PFP/PFP.xml    |   0
 .../MACI/Components/RECEIVERS/LO_LP/LO_LP.xml |   0
 .../RECEIVERS}/LO_SBAND/LO_SBAND.xml          |   0
 .../SRTIFDistributor/SRTIFDistributor.xml     |   0
 .../SRTLPBandReceiver/SRTLPBandReceiver.xml   |   0
 .../HolographyContainer.xml                   |   0
 .../HolographyDXCContainer.xml                |   0
 .../LocalOscillatorLPContainer.xml            |   0
 .../LocalOscillatorsContainer.xml             |   0
 .../NoiseGeneratorContainer.xml               |   0
 .../PyIFDistributorContainer.xml              |   0
 .../SRTLPBandContainer/SRTLPBandContainer.xml |   0
 .../MACI/Containers/XContainer/XContainer.xml |   0
 SRT/Outdated/CDB/alma/.gitignore              |   1 +
 .../ANTENNA/BossSimulator/BossSimulator.xml   |   0
 .../CDB/alma/BACKENDS/DXC2/DXC2.xml           |   0
 .../alma/BACKENDS/Holography/Holography.xml   |   0
 .../NoiseGenerator/NoiseGenerator.xml         |   0
 .../CDB/alma/BACKENDS/XBackends/XBackends.xml |   0
 .../PFP/LookupTables/LookupTables.xml         |   0
 .../MinorServo/PFP/Properties/Properties.xml  |   0
 .../Configuration/Configuration.xml           |   0
 .../SRTIFDistributor14/Mapping/Mapping.xml    |   0
 .../SRTLPBandReceiver/Feeds/Feeds.xml         |   0
 .../SRTLPBandReceiver/Modes/C1C1/C1C1.xml     |   0
 .../SRTLPBandReceiver/Modes/C1C2/C1C2.xml     |   0
 .../SRTLPBandReceiver/Modes/C1C3/C1C3.xml     |   0
 .../SRTLPBandReceiver/Modes/C1C4/C1C4.xml     |   0
 .../SRTLPBandReceiver/Modes/C1C5/C1C5.xml     |   0
 .../SRTLPBandReceiver/Modes/C1L1/C1L1.xml     |   0
 .../SRTLPBandReceiver/Modes/C1L2/C1L2.xml     |   0
 .../SRTLPBandReceiver/Modes/C1L3/C1L3.xml     |   0
 .../SRTLPBandReceiver/Modes/C1L4/C1L4.xml     |   0
 .../SRTLPBandReceiver/Modes/C1L5/C1L5.xml     |   0
 .../SRTLPBandReceiver/Modes/C1XX/C1XX.xml     |   0
 .../SRTLPBandReceiver/Modes/C2C1/C2C1.xml     |   0
 .../SRTLPBandReceiver/Modes/C2C2/C2C2.xml     |   0
 .../SRTLPBandReceiver/Modes/C2C3/C2C3.xml     |   0
 .../SRTLPBandReceiver/Modes/C2C4/C2C4.xml     |   0
 .../SRTLPBandReceiver/Modes/C2C5/C2C5.xml     |   0
 .../SRTLPBandReceiver/Modes/C2L1/C2L1.xml     |   0
 .../SRTLPBandReceiver/Modes/C2L2/C2L2.xml     |   0
 .../SRTLPBandReceiver/Modes/C2L3/C2L3.xml     |   0
 .../SRTLPBandReceiver/Modes/C2L4/C2L4.xml     |   0
 .../SRTLPBandReceiver/Modes/C2L5/C2L5.xml     |   0
 .../SRTLPBandReceiver/Modes/C2XX/C2XX.xml     |   0
 .../SRTLPBandReceiver/Modes/C3C1/C3C1.xml     |   0
 .../SRTLPBandReceiver/Modes/C3C2/C3C2.xml     |   0
 .../SRTLPBandReceiver/Modes/C3C3/C3C3.xml     |   0
 .../SRTLPBandReceiver/Modes/C3C4/C3C4.xml     |   0
 .../SRTLPBandReceiver/Modes/C3C5/C3C5.xml     |   0
 .../SRTLPBandReceiver/Modes/C3L1/C3L1.xml     |   0
 .../SRTLPBandReceiver/Modes/C3L2/C3L2.xml     |   0
 .../SRTLPBandReceiver/Modes/C3L3/C3L3.xml     |   0
 .../SRTLPBandReceiver/Modes/C3L4/C3L4.xml     |   0
 .../SRTLPBandReceiver/Modes/C3L5/C3L5.xml     |   0
 .../SRTLPBandReceiver/Modes/C3XX/C3XX.xml     |   0
 .../SRTLPBandReceiver/Modes/L1C1/L1C1.xml     |   0
 .../SRTLPBandReceiver/Modes/L1C2/L1C2.xml     |   0
 .../SRTLPBandReceiver/Modes/L1C3/L1C3.xml     |   0
 .../SRTLPBandReceiver/Modes/L1C4/L1C4.xml     |   0
 .../SRTLPBandReceiver/Modes/L1C5/L1C5.xml     |   0
 .../SRTLPBandReceiver/Modes/L1L1/L1L1.xml     |   0
 .../SRTLPBandReceiver/Modes/L1L2/L1L2.xml     |   0
 .../SRTLPBandReceiver/Modes/L1L3/L1L3.xml     |   0
 .../SRTLPBandReceiver/Modes/L1L4/L1L4.xml     |   0
 .../SRTLPBandReceiver/Modes/L1L5/L1L5.xml     |   0
 .../SRTLPBandReceiver/Modes/L1XX/L1XX.xml     |   0
 .../SRTLPBandReceiver/Modes/L2C1/L2C1.xml     |   0
 .../SRTLPBandReceiver/Modes/L2C2/L2C2.xml     |   0
 .../SRTLPBandReceiver/Modes/L2C3/L2C3.xml     |   0
 .../SRTLPBandReceiver/Modes/L2C4/L2C4.xml     |   0
 .../SRTLPBandReceiver/Modes/L2C5/L2C5.xml     |   0
 .../SRTLPBandReceiver/Modes/L2L1/L2L1.xml     |   0
 .../SRTLPBandReceiver/Modes/L2L2/L2L2.xml     |   0
 .../SRTLPBandReceiver/Modes/L2L3/L2L3.xml     |   0
 .../SRTLPBandReceiver/Modes/L2L4/L2L4.xml     |   0
 .../SRTLPBandReceiver/Modes/L2L5/L2L5.xml     |   0
 .../SRTLPBandReceiver/Modes/L2XX/L2XX.xml     |   0
 .../SRTLPBandReceiver/Modes/L3C1/L3C1.xml     |   0
 .../SRTLPBandReceiver/Modes/L3C2/L3C2.xml     |   0
 .../SRTLPBandReceiver/Modes/L3C3/L3C3.xml     |   0
 .../SRTLPBandReceiver/Modes/L3C4/L3C4.xml     |   0
 .../SRTLPBandReceiver/Modes/L3C5/L3C5.xml     |   0
 .../SRTLPBandReceiver/Modes/L3L1/L3L1.xml     |   0
 .../SRTLPBandReceiver/Modes/L3L2/L3L2.xml     |   0
 .../SRTLPBandReceiver/Modes/L3L3/L3L3.xml     |   0
 .../SRTLPBandReceiver/Modes/L3L4/L3L4.xml     |   0
 .../SRTLPBandReceiver/Modes/L3L5/L3L5.xml     |   0
 .../SRTLPBandReceiver/Modes/L3XX/L3XX.xml     |   0
 .../Modes/SINGLEDISH/SINGLEDISH.xml           |   0
 .../SRTLPBandReceiver/Modes/VLBI/VLBI.xml     |   0
 .../SRTLPBandReceiver/Modes/XXC1/XXC1.xml     |   0
 .../SRTLPBandReceiver/Modes/XXC2/XXC2.xml     |   0
 .../SRTLPBandReceiver/Modes/XXC3/XXC3.xml     |   0
 .../SRTLPBandReceiver/Modes/XXC4/XXC4.xml     |   0
 .../SRTLPBandReceiver/Modes/XXC5/XXC5.xml     |   0
 .../SRTLPBandReceiver/Modes/XXL1/XXL1.xml     |   0
 .../SRTLPBandReceiver/Modes/XXL2/XXL2.xml     |   0
 .../SRTLPBandReceiver/Modes/XXL3/XXL3.xml     |   0
 .../SRTLPBandReceiver/Modes/XXL4/XXL4.xml     |   0
 .../SRTLPBandReceiver/Modes/XXL5/XXL5.xml     |   0
 .../SRTLPBandReceiver/Modes/make_modes.py     |   0
 .../SRTLPBandReceiver/NoiseMark/NoiseMark.xml |   0
 .../Synthesizer/Synthesizer.xml               |   0
 .../SRTLPBandReceiver/Taper/Taper.xml         |   0
 .../SRTSBandMFReceiver/Feeds/Feeds.xml        |   0
 .../MarkCoefficients/MarkCoefficients.xml     |   0
 .../Modes/SINGLEDISH/SINGLEDISH.xml           |   0
 .../SRTSBandMFReceiver/Modes/VLBI/VLBI.xml    |   0
 .../Synthesizer/Synthesizer.xml               |   0
 .../SRTSBandMFReceiver/Taper/Taper.xml        |   0
 .../CDB/alma/RECEIVERS/LO1/LO1.xml            |   0
 .../CDB/alma/RECEIVERS/LO_LP/LO_LP.xml        |   0
 .../CDB/alma/RECEIVERS/LO_SBAND/LO_SBAND.xml  |   0
 .../SRTIFDistributor/SRTIFDistributor.xml     |   0
 .../SRTIFDistributor14/SRTIFDistributor14.xml |   0
 .../SRTLPBandReceiver/SRTLPBandReceiver.xml   |   0
 .../SRTSBandMFReceiver/SRTSBandMFReceiver.xml |   0
 .../TestNamespace/Positioner/Positioner.xml   |   0
 .../Positioner00/Positioner00.xml             |   0
 .../Positioner01/Positioner01.xml             |   0
 .../Positioner02/Positioner02.xml             |   0
 .../Positioner03/Positioner03.xml             |   0
 331 files changed, 554 insertions(+), 3659 deletions(-)
 create mode 100644 Medicina/Outdated/CDB/MACI/.gitignore
 create mode 100644 Medicina/Outdated/CDB/alma/.gitignore
 rename Medicina/{ => Outdated}/CDB/alma/BACKENDS/NoiseGenerator/NoiseGenerator.xml (100%)
 create mode 100644 Noto/Outdated/CDB/MACI/.gitignore
 create mode 100644 Noto/Outdated/CDB/alma/.gitignore
 delete mode 100644 SRT/CDB/alma/BACKENDS/XBackends/XBackends.xml
 delete mode 100644 SRT/CDB/alma/DataBlock/SRTLPBandReceiver/NoiseMark/NoiseMark.xml
 delete mode 100644 SRT/CDB/alma/MINORSERVO/PFP/PFP.xml
 delete mode 100644 SRT/CDB/alma/RECEIVERS/LO1/LO1.xml
 delete mode 100644 SRT/CDB/alma/RECEIVERS/LO_LP/LO_LP.xml
 delete mode 100644 SRT/CDB/alma/RECEIVERS/SRTIFDistributor/SRTIFDistributor.xml
 delete mode 100755 SRT/CDB/alma/RECEIVERS/SRTLPBandReceiver/SRTLPBandReceiver.xml
 delete mode 100644 SRT/Configuration/CDB/MACI/Components/BACKENDS/NoiseGenerator/NoiseGenerator.xml
 delete mode 100644 SRT/Configuration/CDB/alma/BACKENDS/NoiseGenerator/NoiseGenerator.xml
 delete mode 100755 SRT/Configuration/CDB/alma/DataBlock/SRTIFDistributor/Configuration/Configuration.xml
 delete mode 100755 SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Feeds/Feeds.xml
 delete mode 100755 SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C1C1/C1C1.xml
 delete mode 100755 SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C1C2/C1C2.xml
 delete mode 100755 SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C1C3/C1C3.xml
 delete mode 100755 SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C1C4/C1C4.xml
 delete mode 100755 SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C1C5/C1C5.xml
 delete mode 100755 SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C1L1/C1L1.xml
 delete mode 100755 SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C1L2/C1L2.xml
 delete mode 100755 SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C1L3/C1L3.xml
 delete mode 100755 SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C1L4/C1L4.xml
 delete mode 100755 SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C1L5/C1L5.xml
 delete mode 100755 SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C1XX/C1XX.xml
 delete mode 100755 SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C2C1/C2C1.xml
 delete mode 100755 SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C2C2/C2C2.xml
 delete mode 100755 SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C2C3/C2C3.xml
 delete mode 100755 SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C2C4/C2C4.xml
 delete mode 100755 SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C2C5/C2C5.xml
 delete mode 100755 SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C2L1/C2L1.xml
 delete mode 100755 SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C2L2/C2L2.xml
 delete mode 100755 SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C2L3/C2L3.xml
 delete mode 100755 SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C2L4/C2L4.xml
 delete mode 100755 SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C2L5/C2L5.xml
 delete mode 100755 SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C2XX/C2XX.xml
 delete mode 100755 SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C3C1/C3C1.xml
 delete mode 100755 SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C3C2/C3C2.xml
 delete mode 100755 SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C3C3/C3C3.xml
 delete mode 100755 SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C3C4/C3C4.xml
 delete mode 100755 SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C3C5/C3C5.xml
 delete mode 100755 SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C3L1/C3L1.xml
 delete mode 100755 SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C3L2/C3L2.xml
 delete mode 100755 SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C3L3/C3L3.xml
 delete mode 100755 SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C3L4/C3L4.xml
 delete mode 100755 SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C3L5/C3L5.xml
 delete mode 100755 SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C3XX/C3XX.xml
 delete mode 100755 SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L1C1/L1C1.xml
 delete mode 100755 SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L1C2/L1C2.xml
 delete mode 100755 SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L1C3/L1C3.xml
 delete mode 100755 SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L1C4/L1C4.xml
 delete mode 100755 SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L1C5/L1C5.xml
 delete mode 100755 SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L1L1/L1L1.xml
 delete mode 100755 SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L1L2/L1L2.xml
 delete mode 100755 SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L1L3/L1L3.xml
 delete mode 100755 SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L1L4/L1L4.xml
 delete mode 100755 SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L1L5/L1L5.xml
 delete mode 100755 SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L1XX/L1XX.xml
 delete mode 100755 SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L2C1/L2C1.xml
 delete mode 100755 SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L2C2/L2C2.xml
 delete mode 100755 SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L2C3/L2C3.xml
 delete mode 100755 SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L2C4/L2C4.xml
 delete mode 100755 SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L2C5/L2C5.xml
 delete mode 100755 SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L2L1/L2L1.xml
 delete mode 100755 SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L2L2/L2L2.xml
 delete mode 100755 SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L2L3/L2L3.xml
 delete mode 100755 SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L2L4/L2L4.xml
 delete mode 100755 SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L2L5/L2L5.xml
 delete mode 100755 SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L2XX/L2XX.xml
 delete mode 100755 SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L3C1/L3C1.xml
 delete mode 100755 SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L3C2/L3C2.xml
 delete mode 100755 SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L3C3/L3C3.xml
 delete mode 100755 SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L3C4/L3C4.xml
 delete mode 100755 SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L3C5/L3C5.xml
 delete mode 100755 SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L3L1/L3L1.xml
 delete mode 100755 SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L3L2/L3L2.xml
 delete mode 100755 SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L3L3/L3L3.xml
 delete mode 100755 SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L3L4/L3L4.xml
 delete mode 100755 SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L3L5/L3L5.xml
 delete mode 100755 SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L3XX/L3XX.xml
 delete mode 100755 SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/XXC1/XXC1.xml
 delete mode 100755 SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/XXC2/XXC2.xml
 delete mode 100755 SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/XXC3/XXC3.xml
 delete mode 100755 SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/XXC4/XXC4.xml
 delete mode 100755 SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/XXC5/XXC5.xml
 delete mode 100755 SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/XXL1/XXL1.xml
 delete mode 100755 SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/XXL2/XXL2.xml
 delete mode 100755 SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/XXL3/XXL3.xml
 delete mode 100755 SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/XXL4/XXL4.xml
 delete mode 100755 SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/XXL5/XXL5.xml
 delete mode 100755 SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/make_modes.py
 delete mode 100644 SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Synthesizer/Synthesizer.xml
 delete mode 100755 SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Taper/Taper.xml
 create mode 100644 SRT/Outdated/CDB/MACI/.gitignore
 rename SRT/{Configuration => Outdated}/CDB/MACI/Components/BACKENDS/DXC2/DXC2.xml (100%)
 rename SRT/{Configuration => Outdated}/CDB/MACI/Components/BACKENDS/Holography/Holography.xml (100%)
 rename {Medicina/Configuration/CDB/alma => SRT/Outdated/CDB/MACI/Components}/BACKENDS/NoiseGenerator/NoiseGenerator.xml (100%)
 rename SRT/{Configuration => Outdated}/CDB/MACI/Components/BACKENDS/XBackends/XBackends.xml (100%)
 rename SRT/{Configuration => Outdated}/CDB/MACI/Components/MINORSERVO/PFP/PFP.xml (100%)
 rename SRT/{Configuration => Outdated}/CDB/MACI/Components/RECEIVERS/LO_LP/LO_LP.xml (100%)
 rename SRT/{CDB/MACI/Components => Outdated/CDB/MACI/Components/RECEIVERS}/LO_SBAND/LO_SBAND.xml (100%)
 rename SRT/{Configuration => Outdated}/CDB/MACI/Components/RECEIVERS/SRTIFDistributor/SRTIFDistributor.xml (100%)
 rename SRT/{Configuration => Outdated}/CDB/MACI/Components/RECEIVERS/SRTLPBandReceiver/SRTLPBandReceiver.xml (100%)
 rename SRT/{Configuration => Outdated}/CDB/MACI/Containers/HolographyContainer/HolographyContainer.xml (100%)
 rename SRT/{Configuration => Outdated}/CDB/MACI/Containers/HolographyDXCContainer/HolographyDXCContainer.xml (100%)
 rename SRT/{Configuration => Outdated}/CDB/MACI/Containers/LocalOscillatorLPContainer/LocalOscillatorLPContainer.xml (100%)
 rename SRT/{Configuration => Outdated}/CDB/MACI/Containers/LocalOscillatorsContainer/LocalOscillatorsContainer.xml (100%)
 rename SRT/{Configuration => Outdated}/CDB/MACI/Containers/NoiseGeneratorContainer/NoiseGeneratorContainer.xml (100%)
 rename SRT/{Configuration => Outdated}/CDB/MACI/Containers/PyIFDistributorContainer/PyIFDistributorContainer.xml (100%)
 rename SRT/{Configuration => Outdated}/CDB/MACI/Containers/SRTLPBandContainer/SRTLPBandContainer.xml (100%)
 rename SRT/{Configuration => Outdated}/CDB/MACI/Containers/XContainer/XContainer.xml (100%)
 create mode 100644 SRT/Outdated/CDB/alma/.gitignore
 rename SRT/{ => Outdated}/CDB/alma/ANTENNA/BossSimulator/BossSimulator.xml (100%)
 rename SRT/{Configuration => Outdated}/CDB/alma/BACKENDS/DXC2/DXC2.xml (100%)
 rename SRT/{Configuration => Outdated}/CDB/alma/BACKENDS/Holography/Holography.xml (100%)
 rename SRT/{ => Outdated}/CDB/alma/BACKENDS/NoiseGenerator/NoiseGenerator.xml (100%)
 rename SRT/{Configuration => Outdated}/CDB/alma/BACKENDS/XBackends/XBackends.xml (100%)
 rename SRT/{Configuration => Outdated}/CDB/alma/DataBlock/MinorServo/PFP/LookupTables/LookupTables.xml (100%)
 rename SRT/{Configuration => Outdated}/CDB/alma/DataBlock/MinorServo/PFP/Properties/Properties.xml (100%)
 rename SRT/{ => Outdated}/CDB/alma/DataBlock/SRTIFDistributor/Configuration/Configuration.xml (100%)
 rename SRT/{ => Outdated}/CDB/alma/DataBlock/SRTIFDistributor14/Mapping/Mapping.xml (100%)
 rename SRT/{ => Outdated}/CDB/alma/DataBlock/SRTLPBandReceiver/Feeds/Feeds.xml (100%)
 rename SRT/{ => Outdated}/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C1C1/C1C1.xml (100%)
 rename SRT/{ => Outdated}/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C1C2/C1C2.xml (100%)
 rename SRT/{ => Outdated}/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C1C3/C1C3.xml (100%)
 rename SRT/{ => Outdated}/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C1C4/C1C4.xml (100%)
 rename SRT/{ => Outdated}/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C1C5/C1C5.xml (100%)
 rename SRT/{ => Outdated}/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C1L1/C1L1.xml (100%)
 rename SRT/{ => Outdated}/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C1L2/C1L2.xml (100%)
 rename SRT/{ => Outdated}/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C1L3/C1L3.xml (100%)
 rename SRT/{ => Outdated}/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C1L4/C1L4.xml (100%)
 rename SRT/{ => Outdated}/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C1L5/C1L5.xml (100%)
 rename SRT/{ => Outdated}/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C1XX/C1XX.xml (100%)
 rename SRT/{ => Outdated}/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C2C1/C2C1.xml (100%)
 rename SRT/{ => Outdated}/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C2C2/C2C2.xml (100%)
 rename SRT/{ => Outdated}/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C2C3/C2C3.xml (100%)
 rename SRT/{ => Outdated}/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C2C4/C2C4.xml (100%)
 rename SRT/{ => Outdated}/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C2C5/C2C5.xml (100%)
 rename SRT/{ => Outdated}/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C2L1/C2L1.xml (100%)
 rename SRT/{ => Outdated}/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C2L2/C2L2.xml (100%)
 rename SRT/{ => Outdated}/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C2L3/C2L3.xml (100%)
 rename SRT/{ => Outdated}/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C2L4/C2L4.xml (100%)
 rename SRT/{ => Outdated}/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C2L5/C2L5.xml (100%)
 rename SRT/{ => Outdated}/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C2XX/C2XX.xml (100%)
 rename SRT/{ => Outdated}/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C3C1/C3C1.xml (100%)
 rename SRT/{ => Outdated}/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C3C2/C3C2.xml (100%)
 rename SRT/{ => Outdated}/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C3C3/C3C3.xml (100%)
 rename SRT/{ => Outdated}/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C3C4/C3C4.xml (100%)
 rename SRT/{ => Outdated}/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C3C5/C3C5.xml (100%)
 rename SRT/{ => Outdated}/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C3L1/C3L1.xml (100%)
 rename SRT/{ => Outdated}/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C3L2/C3L2.xml (100%)
 rename SRT/{ => Outdated}/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C3L3/C3L3.xml (100%)
 rename SRT/{ => Outdated}/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C3L4/C3L4.xml (100%)
 rename SRT/{ => Outdated}/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C3L5/C3L5.xml (100%)
 rename SRT/{ => Outdated}/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C3XX/C3XX.xml (100%)
 rename SRT/{ => Outdated}/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L1C1/L1C1.xml (100%)
 rename SRT/{ => Outdated}/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L1C2/L1C2.xml (100%)
 rename SRT/{ => Outdated}/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L1C3/L1C3.xml (100%)
 rename SRT/{ => Outdated}/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L1C4/L1C4.xml (100%)
 rename SRT/{ => Outdated}/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L1C5/L1C5.xml (100%)
 rename SRT/{ => Outdated}/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L1L1/L1L1.xml (100%)
 rename SRT/{ => Outdated}/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L1L2/L1L2.xml (100%)
 rename SRT/{ => Outdated}/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L1L3/L1L3.xml (100%)
 rename SRT/{ => Outdated}/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L1L4/L1L4.xml (100%)
 rename SRT/{ => Outdated}/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L1L5/L1L5.xml (100%)
 rename SRT/{ => Outdated}/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L1XX/L1XX.xml (100%)
 rename SRT/{ => Outdated}/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L2C1/L2C1.xml (100%)
 rename SRT/{ => Outdated}/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L2C2/L2C2.xml (100%)
 rename SRT/{ => Outdated}/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L2C3/L2C3.xml (100%)
 rename SRT/{ => Outdated}/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L2C4/L2C4.xml (100%)
 rename SRT/{ => Outdated}/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L2C5/L2C5.xml (100%)
 rename SRT/{ => Outdated}/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L2L1/L2L1.xml (100%)
 rename SRT/{ => Outdated}/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L2L2/L2L2.xml (100%)
 rename SRT/{ => Outdated}/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L2L3/L2L3.xml (100%)
 rename SRT/{ => Outdated}/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L2L4/L2L4.xml (100%)
 rename SRT/{ => Outdated}/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L2L5/L2L5.xml (100%)
 rename SRT/{ => Outdated}/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L2XX/L2XX.xml (100%)
 rename SRT/{ => Outdated}/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L3C1/L3C1.xml (100%)
 rename SRT/{ => Outdated}/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L3C2/L3C2.xml (100%)
 rename SRT/{ => Outdated}/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L3C3/L3C3.xml (100%)
 rename SRT/{ => Outdated}/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L3C4/L3C4.xml (100%)
 rename SRT/{ => Outdated}/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L3C5/L3C5.xml (100%)
 rename SRT/{ => Outdated}/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L3L1/L3L1.xml (100%)
 rename SRT/{ => Outdated}/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L3L2/L3L2.xml (100%)
 rename SRT/{ => Outdated}/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L3L3/L3L3.xml (100%)
 rename SRT/{ => Outdated}/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L3L4/L3L4.xml (100%)
 rename SRT/{ => Outdated}/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L3L5/L3L5.xml (100%)
 rename SRT/{ => Outdated}/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L3XX/L3XX.xml (100%)
 rename SRT/{ => Outdated}/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/SINGLEDISH/SINGLEDISH.xml (100%)
 rename SRT/{ => Outdated}/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/VLBI/VLBI.xml (100%)
 rename SRT/{ => Outdated}/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/XXC1/XXC1.xml (100%)
 rename SRT/{ => Outdated}/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/XXC2/XXC2.xml (100%)
 rename SRT/{ => Outdated}/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/XXC3/XXC3.xml (100%)
 rename SRT/{ => Outdated}/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/XXC4/XXC4.xml (100%)
 rename SRT/{ => Outdated}/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/XXC5/XXC5.xml (100%)
 rename SRT/{ => Outdated}/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/XXL1/XXL1.xml (100%)
 rename SRT/{ => Outdated}/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/XXL2/XXL2.xml (100%)
 rename SRT/{ => Outdated}/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/XXL3/XXL3.xml (100%)
 rename SRT/{ => Outdated}/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/XXL4/XXL4.xml (100%)
 rename SRT/{ => Outdated}/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/XXL5/XXL5.xml (100%)
 rename SRT/{ => Outdated}/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/make_modes.py (100%)
 rename SRT/{Configuration => Outdated}/CDB/alma/DataBlock/SRTLPBandReceiver/NoiseMark/NoiseMark.xml (100%)
 rename SRT/{ => Outdated}/CDB/alma/DataBlock/SRTLPBandReceiver/Synthesizer/Synthesizer.xml (100%)
 rename SRT/{ => Outdated}/CDB/alma/DataBlock/SRTLPBandReceiver/Taper/Taper.xml (100%)
 rename SRT/{Configuration => Outdated}/CDB/alma/DataBlock/SRTSBandMFReceiver/Feeds/Feeds.xml (100%)
 rename SRT/{Configuration => Outdated}/CDB/alma/DataBlock/SRTSBandMFReceiver/MarkCoefficients/MarkCoefficients.xml (100%)
 rename SRT/{Configuration => Outdated}/CDB/alma/DataBlock/SRTSBandMFReceiver/Modes/SINGLEDISH/SINGLEDISH.xml (100%)
 rename SRT/{Configuration => Outdated}/CDB/alma/DataBlock/SRTSBandMFReceiver/Modes/VLBI/VLBI.xml (100%)
 rename SRT/{Configuration => Outdated}/CDB/alma/DataBlock/SRTSBandMFReceiver/Synthesizer/Synthesizer.xml (100%)
 rename SRT/{Configuration => Outdated}/CDB/alma/DataBlock/SRTSBandMFReceiver/Taper/Taper.xml (100%)
 rename SRT/{Configuration => Outdated}/CDB/alma/RECEIVERS/LO1/LO1.xml (100%)
 rename SRT/{Configuration => Outdated}/CDB/alma/RECEIVERS/LO_LP/LO_LP.xml (100%)
 rename SRT/{ => Outdated}/CDB/alma/RECEIVERS/LO_SBAND/LO_SBAND.xml (100%)
 rename SRT/{Configuration => Outdated}/CDB/alma/RECEIVERS/SRTIFDistributor/SRTIFDistributor.xml (100%)
 rename SRT/{ => Outdated}/CDB/alma/RECEIVERS/SRTIFDistributor14/SRTIFDistributor14.xml (100%)
 rename SRT/{Configuration => Outdated}/CDB/alma/RECEIVERS/SRTLPBandReceiver/SRTLPBandReceiver.xml (100%)
 rename SRT/{ => Outdated}/CDB/alma/RECEIVERS/SRTSBandMFReceiver/SRTSBandMFReceiver.xml (100%)
 rename SRT/{ => Outdated}/CDB/alma/TestNamespace/Positioner/Positioner.xml (100%)
 rename SRT/{ => Outdated}/CDB/alma/TestNamespace/Positioner00/Positioner00.xml (100%)
 rename SRT/{ => Outdated}/CDB/alma/TestNamespace/Positioner01/Positioner01.xml (100%)
 rename SRT/{ => Outdated}/CDB/alma/TestNamespace/Positioner02/Positioner02.xml (100%)
 rename SRT/{ => Outdated}/CDB/alma/TestNamespace/Positioner03/Positioner03.xml (100%)

diff --git a/Medicina/CDB/MACI/Components/AS/SECTOR01/LAN01/LAN01.xml b/Medicina/CDB/MACI/Components/AS/SECTOR01/LAN01/LAN01.xml
index b731bc5f2..bbe97f872 100644
--- a/Medicina/CDB/MACI/Components/AS/SECTOR01/LAN01/LAN01.xml
+++ b/Medicina/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="MedicinaActiveSurfaceContainer01" ImplLang="cpp">
-      <_ Name="USD01"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD01"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
 
 </HierarchicalComponent>
diff --git a/Medicina/CDB/MACI/Components/AS/SECTOR01/LAN02/LAN02.xml b/Medicina/CDB/MACI/Components/AS/SECTOR01/LAN02/LAN02.xml
index d431b18f6..ee657b93e 100644
--- a/Medicina/CDB/MACI/Components/AS/SECTOR01/LAN02/LAN02.xml
+++ b/Medicina/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="MedicinaActiveSurfaceContainer01" ImplLang="cpp">
-      <_ Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
 
 </HierarchicalComponent>
diff --git a/Medicina/CDB/MACI/Components/AS/SECTOR01/LAN03/LAN03.xml b/Medicina/CDB/MACI/Components/AS/SECTOR01/LAN03/LAN03.xml
index baa2b0e94..e7a13dad9 100644
--- a/Medicina/CDB/MACI/Components/AS/SECTOR01/LAN03/LAN03.xml
+++ b/Medicina/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="MedicinaActiveSurfaceContainer01" ImplLang="cpp">
-      <_ Name="USD01"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD01"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
 
 </HierarchicalComponent>
diff --git a/Medicina/CDB/MACI/Components/AS/SECTOR01/LAN04/LAN04.xml b/Medicina/CDB/MACI/Components/AS/SECTOR01/LAN04/LAN04.xml
index 87e72a6e0..43c71c39b 100644
--- a/Medicina/CDB/MACI/Components/AS/SECTOR01/LAN04/LAN04.xml
+++ b/Medicina/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="MedicinaActiveSurfaceContainer01" ImplLang="cpp">
-      <_ Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
 
 </HierarchicalComponent>
diff --git a/Medicina/CDB/MACI/Components/AS/SECTOR01/LAN05/LAN05.xml b/Medicina/CDB/MACI/Components/AS/SECTOR01/LAN05/LAN05.xml
index 1a58647b4..98d4e65e4 100644
--- a/Medicina/CDB/MACI/Components/AS/SECTOR01/LAN05/LAN05.xml
+++ b/Medicina/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="MedicinaActiveSurfaceContainer01" ImplLang="cpp">
-      <_ Name="USD01"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD01"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
 
 </HierarchicalComponent>
diff --git a/Medicina/CDB/MACI/Components/AS/SECTOR01/LAN06/LAN06.xml b/Medicina/CDB/MACI/Components/AS/SECTOR01/LAN06/LAN06.xml
index 8109d4b9a..7b05fabe0 100644
--- a/Medicina/CDB/MACI/Components/AS/SECTOR01/LAN06/LAN06.xml
+++ b/Medicina/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="MedicinaActiveSurfaceContainer01" ImplLang="cpp">
-      <_ Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
 
 </HierarchicalComponent>
diff --git a/Medicina/CDB/MACI/Components/AS/SECTOR01/LAN07/LAN07.xml b/Medicina/CDB/MACI/Components/AS/SECTOR01/LAN07/LAN07.xml
index 890eed68d..8335432c9 100644
--- a/Medicina/CDB/MACI/Components/AS/SECTOR01/LAN07/LAN07.xml
+++ b/Medicina/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="MedicinaActiveSurfaceContainer01" ImplLang="cpp">
-      <_ Name="USD01"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD07"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD01"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD07"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
 
 </HierarchicalComponent>
diff --git a/Medicina/CDB/MACI/Components/AS/SECTOR01/LAN08/LAN08.xml b/Medicina/CDB/MACI/Components/AS/SECTOR01/LAN08/LAN08.xml
index d5f96ee09..19ee8a30d 100644
--- a/Medicina/CDB/MACI/Components/AS/SECTOR01/LAN08/LAN08.xml
+++ b/Medicina/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="MedicinaActiveSurfaceContainer01" ImplLang="cpp">
-      <_ Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
 
 </HierarchicalComponent>
diff --git a/Medicina/CDB/MACI/Components/AS/SECTOR01/LAN09/LAN09.xml b/Medicina/CDB/MACI/Components/AS/SECTOR01/LAN09/LAN09.xml
index 391b9704e..39dfaf014 100644
--- a/Medicina/CDB/MACI/Components/AS/SECTOR01/LAN09/LAN09.xml
+++ b/Medicina/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="MedicinaActiveSurfaceContainer01" ImplLang="cpp">
-      <_ Name="USD01"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD01"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
 
 </HierarchicalComponent>
diff --git a/Medicina/CDB/MACI/Components/AS/SECTOR01/LAN10/LAN10.xml b/Medicina/CDB/MACI/Components/AS/SECTOR01/LAN10/LAN10.xml
index 87dd01511..203e82ba2 100644
--- a/Medicina/CDB/MACI/Components/AS/SECTOR01/LAN10/LAN10.xml
+++ b/Medicina/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="MedicinaActiveSurfaceContainer01" ImplLang="cpp">
-      <_ Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
 
 </HierarchicalComponent>
diff --git a/Medicina/CDB/MACI/Components/AS/SECTOR01/LAN11/LAN11.xml b/Medicina/CDB/MACI/Components/AS/SECTOR01/LAN11/LAN11.xml
index dd76e40df..e7d027452 100644
--- a/Medicina/CDB/MACI/Components/AS/SECTOR01/LAN11/LAN11.xml
+++ b/Medicina/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="MedicinaActiveSurfaceContainer01" ImplLang="cpp">
-      <_ Name="USD01"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD01"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
 
 </HierarchicalComponent>
diff --git a/Medicina/CDB/MACI/Components/AS/SECTOR01/LAN12/LAN12.xml b/Medicina/CDB/MACI/Components/AS/SECTOR01/LAN12/LAN12.xml
index a0616d642..0f1f87771 100644
--- a/Medicina/CDB/MACI/Components/AS/SECTOR01/LAN12/LAN12.xml
+++ b/Medicina/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="MedicinaActiveSurfaceContainer01" ImplLang="cpp">
-      <_ Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
 
 </HierarchicalComponent>
diff --git a/Medicina/CDB/MACI/Components/AS/SECTOR02/LAN01/LAN01.xml b/Medicina/CDB/MACI/Components/AS/SECTOR02/LAN01/LAN01.xml
index 956741b1d..853178ff1 100644
--- a/Medicina/CDB/MACI/Components/AS/SECTOR02/LAN01/LAN01.xml
+++ b/Medicina/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="MedicinaActiveSurfaceContainer02" ImplLang="cpp">
-      <_ Name="USD01"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD01"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
 
 </HierarchicalComponent>
diff --git a/Medicina/CDB/MACI/Components/AS/SECTOR02/LAN02/LAN02.xml b/Medicina/CDB/MACI/Components/AS/SECTOR02/LAN02/LAN02.xml
index e24bbd38d..937a69734 100644
--- a/Medicina/CDB/MACI/Components/AS/SECTOR02/LAN02/LAN02.xml
+++ b/Medicina/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="MedicinaActiveSurfaceContainer02" ImplLang="cpp">
-      <_ Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
 
 </HierarchicalComponent>
diff --git a/Medicina/CDB/MACI/Components/AS/SECTOR02/LAN03/LAN03.xml b/Medicina/CDB/MACI/Components/AS/SECTOR02/LAN03/LAN03.xml
index f43bcfe8d..1f21c92ab 100644
--- a/Medicina/CDB/MACI/Components/AS/SECTOR02/LAN03/LAN03.xml
+++ b/Medicina/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="MedicinaActiveSurfaceContainer02" ImplLang="cpp">
-      <_ Name="USD01"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD01"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
 
 </HierarchicalComponent>
diff --git a/Medicina/CDB/MACI/Components/AS/SECTOR02/LAN04/LAN04.xml b/Medicina/CDB/MACI/Components/AS/SECTOR02/LAN04/LAN04.xml
index aa56f71c9..ed0f1c208 100644
--- a/Medicina/CDB/MACI/Components/AS/SECTOR02/LAN04/LAN04.xml
+++ b/Medicina/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="MedicinaActiveSurfaceContainer02" ImplLang="cpp">
-      <_ Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
 
 </HierarchicalComponent>
diff --git a/Medicina/CDB/MACI/Components/AS/SECTOR02/LAN05/LAN05.xml b/Medicina/CDB/MACI/Components/AS/SECTOR02/LAN05/LAN05.xml
index 2cacfccbb..a81d3a278 100644
--- a/Medicina/CDB/MACI/Components/AS/SECTOR02/LAN05/LAN05.xml
+++ b/Medicina/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="MedicinaActiveSurfaceContainer02" ImplLang="cpp">
-      <_ Name="USD01"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD01"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
 
 </HierarchicalComponent>
diff --git a/Medicina/CDB/MACI/Components/AS/SECTOR02/LAN06/LAN06.xml b/Medicina/CDB/MACI/Components/AS/SECTOR02/LAN06/LAN06.xml
index e1fa8d036..1796ff38d 100644
--- a/Medicina/CDB/MACI/Components/AS/SECTOR02/LAN06/LAN06.xml
+++ b/Medicina/CDB/MACI/Components/AS/SECTOR02/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="MedicinaActiveSurfaceContainer02" ImplLang="cpp">
-      <_ Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
 
 </HierarchicalComponent>
diff --git a/Medicina/CDB/MACI/Components/AS/SECTOR02/LAN07/LAN07.xml b/Medicina/CDB/MACI/Components/AS/SECTOR02/LAN07/LAN07.xml
index f6d0a4f64..56affd411 100644
--- a/Medicina/CDB/MACI/Components/AS/SECTOR02/LAN07/LAN07.xml
+++ b/Medicina/CDB/MACI/Components/AS/SECTOR02/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="MedicinaActiveSurfaceContainer02" ImplLang="cpp">
-      <_ Name="USD01"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD07"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD01"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD07"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
 
 </HierarchicalComponent>
diff --git a/Medicina/CDB/MACI/Components/AS/SECTOR02/LAN08/LAN08.xml b/Medicina/CDB/MACI/Components/AS/SECTOR02/LAN08/LAN08.xml
index 104be2efe..a08378c74 100644
--- a/Medicina/CDB/MACI/Components/AS/SECTOR02/LAN08/LAN08.xml
+++ b/Medicina/CDB/MACI/Components/AS/SECTOR02/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="MedicinaActiveSurfaceContainer02" ImplLang="cpp">
-      <_ Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
 
 </HierarchicalComponent>
diff --git a/Medicina/CDB/MACI/Components/AS/SECTOR02/LAN09/LAN09.xml b/Medicina/CDB/MACI/Components/AS/SECTOR02/LAN09/LAN09.xml
index 4dc436b35..8d88f2866 100644
--- a/Medicina/CDB/MACI/Components/AS/SECTOR02/LAN09/LAN09.xml
+++ b/Medicina/CDB/MACI/Components/AS/SECTOR02/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="MedicinaActiveSurfaceContainer02" ImplLang="cpp">
-      <_ Name="USD01"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD01"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
 
 </HierarchicalComponent>
diff --git a/Medicina/CDB/MACI/Components/AS/SECTOR02/LAN10/LAN10.xml b/Medicina/CDB/MACI/Components/AS/SECTOR02/LAN10/LAN10.xml
index c544bb661..30b69e097 100644
--- a/Medicina/CDB/MACI/Components/AS/SECTOR02/LAN10/LAN10.xml
+++ b/Medicina/CDB/MACI/Components/AS/SECTOR02/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="MedicinaActiveSurfaceContainer02" ImplLang="cpp">
-      <_ Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
 
 </HierarchicalComponent>
diff --git a/Medicina/CDB/MACI/Components/AS/SECTOR02/LAN11/LAN11.xml b/Medicina/CDB/MACI/Components/AS/SECTOR02/LAN11/LAN11.xml
index 6f4663cb4..98e722282 100644
--- a/Medicina/CDB/MACI/Components/AS/SECTOR02/LAN11/LAN11.xml
+++ b/Medicina/CDB/MACI/Components/AS/SECTOR02/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="MedicinaActiveSurfaceContainer02" ImplLang="cpp">
-      <_ Name="USD01"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD01"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
 
 </HierarchicalComponent>
diff --git a/Medicina/CDB/MACI/Components/AS/SECTOR02/LAN12/LAN12.xml b/Medicina/CDB/MACI/Components/AS/SECTOR02/LAN12/LAN12.xml
index 54f04d1e6..28ddc74b2 100644
--- a/Medicina/CDB/MACI/Components/AS/SECTOR02/LAN12/LAN12.xml
+++ b/Medicina/CDB/MACI/Components/AS/SECTOR02/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="MedicinaActiveSurfaceContainer02" ImplLang="cpp">
-      <_ Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
 
 </HierarchicalComponent>
diff --git a/Medicina/CDB/MACI/Components/AS/SECTOR03/LAN01/LAN01.xml b/Medicina/CDB/MACI/Components/AS/SECTOR03/LAN01/LAN01.xml
index 8cc2514a7..8fda36ea5 100644
--- a/Medicina/CDB/MACI/Components/AS/SECTOR03/LAN01/LAN01.xml
+++ b/Medicina/CDB/MACI/Components/AS/SECTOR03/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="MedicinaActiveSurfaceContainer03" ImplLang="cpp">
-      <_ Name="USD01"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
-      <_ Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
-      <_ Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
-      <_ Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
-      <_ Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
-      <_ Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD01"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
 
 </HierarchicalComponent>
diff --git a/Medicina/CDB/MACI/Components/AS/SECTOR03/LAN02/LAN02.xml b/Medicina/CDB/MACI/Components/AS/SECTOR03/LAN02/LAN02.xml
index 2930fd549..82cbb8b87 100644
--- a/Medicina/CDB/MACI/Components/AS/SECTOR03/LAN02/LAN02.xml
+++ b/Medicina/CDB/MACI/Components/AS/SECTOR03/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="MedicinaActiveSurfaceContainer03" ImplLang="cpp">
-      <_ Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
-      <_ Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
-      <_ Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
-      <_ Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
-      <_ Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
 
 </HierarchicalComponent>
diff --git a/Medicina/CDB/MACI/Components/AS/SECTOR03/LAN03/LAN03.xml b/Medicina/CDB/MACI/Components/AS/SECTOR03/LAN03/LAN03.xml
index dec50ed50..1ded634d5 100644
--- a/Medicina/CDB/MACI/Components/AS/SECTOR03/LAN03/LAN03.xml
+++ b/Medicina/CDB/MACI/Components/AS/SECTOR03/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="MedicinaActiveSurfaceContainer03" ImplLang="cpp">
-      <_ Name="USD01"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
-      <_ Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
-      <_ Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
-      <_ Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
-      <_ Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
-      <_ Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD01"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
 
 </HierarchicalComponent>
diff --git a/Medicina/CDB/MACI/Components/AS/SECTOR03/LAN04/LAN04.xml b/Medicina/CDB/MACI/Components/AS/SECTOR03/LAN04/LAN04.xml
index 2b7de7b3e..71a15facb 100644
--- a/Medicina/CDB/MACI/Components/AS/SECTOR03/LAN04/LAN04.xml
+++ b/Medicina/CDB/MACI/Components/AS/SECTOR03/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="MedicinaActiveSurfaceContainer03" ImplLang="cpp">
-      <_ Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
-      <_ Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
-      <_ Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
-      <_ Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
-      <_ Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
 
 </HierarchicalComponent>
diff --git a/Medicina/CDB/MACI/Components/AS/SECTOR03/LAN05/LAN05.xml b/Medicina/CDB/MACI/Components/AS/SECTOR03/LAN05/LAN05.xml
index 2b7388648..e781a84a9 100644
--- a/Medicina/CDB/MACI/Components/AS/SECTOR03/LAN05/LAN05.xml
+++ b/Medicina/CDB/MACI/Components/AS/SECTOR03/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="MedicinaActiveSurfaceContainer03" ImplLang="cpp">
-      <_ Name="USD01"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
-      <_ Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
-      <_ Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
-      <_ Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
-      <_ Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
-      <_ Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD01"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
 
 </HierarchicalComponent>
diff --git a/Medicina/CDB/MACI/Components/AS/SECTOR03/LAN06/LAN06.xml b/Medicina/CDB/MACI/Components/AS/SECTOR03/LAN06/LAN06.xml
index e5d2ec2f6..9498f0415 100644
--- a/Medicina/CDB/MACI/Components/AS/SECTOR03/LAN06/LAN06.xml
+++ b/Medicina/CDB/MACI/Components/AS/SECTOR03/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="MedicinaActiveSurfaceContainer03" ImplLang="cpp">
-      <_ Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
-      <_ Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
-      <_ Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
-      <_ Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
-      <_ Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
 
 </HierarchicalComponent>
diff --git a/Medicina/CDB/MACI/Components/AS/SECTOR03/LAN07/LAN07.xml b/Medicina/CDB/MACI/Components/AS/SECTOR03/LAN07/LAN07.xml
index 19ea4d0ea..bffcb99a3 100644
--- a/Medicina/CDB/MACI/Components/AS/SECTOR03/LAN07/LAN07.xml
+++ b/Medicina/CDB/MACI/Components/AS/SECTOR03/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="MedicinaActiveSurfaceContainer03" ImplLang="cpp">
-      <_ Name="USD01"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
-      <_ Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
-      <_ Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
-      <_ Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
-      <_ Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
-      <_ Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
-      <_ Name="USD07"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD01"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD07"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
 
 </HierarchicalComponent>
diff --git a/Medicina/CDB/MACI/Components/AS/SECTOR03/LAN08/LAN08.xml b/Medicina/CDB/MACI/Components/AS/SECTOR03/LAN08/LAN08.xml
index 7d473ed93..a9c92f964 100644
--- a/Medicina/CDB/MACI/Components/AS/SECTOR03/LAN08/LAN08.xml
+++ b/Medicina/CDB/MACI/Components/AS/SECTOR03/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="MedicinaActiveSurfaceContainer03" ImplLang="cpp">
-      <_ Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
-      <_ Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
-      <_ Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
-      <_ Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
-      <_ Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
 
 </HierarchicalComponent>
diff --git a/Medicina/CDB/MACI/Components/AS/SECTOR03/LAN09/LAN09.xml b/Medicina/CDB/MACI/Components/AS/SECTOR03/LAN09/LAN09.xml
index 091eab441..1d4e0a1d4 100644
--- a/Medicina/CDB/MACI/Components/AS/SECTOR03/LAN09/LAN09.xml
+++ b/Medicina/CDB/MACI/Components/AS/SECTOR03/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="MedicinaActiveSurfaceContainer03" ImplLang="cpp">
-      <_ Name="USD01"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
-      <_ Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
-      <_ Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
-      <_ Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
-      <_ Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
-      <_ Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD01"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
 
 </HierarchicalComponent>
diff --git a/Medicina/CDB/MACI/Components/AS/SECTOR03/LAN10/LAN10.xml b/Medicina/CDB/MACI/Components/AS/SECTOR03/LAN10/LAN10.xml
index 8849be343..740115c05 100644
--- a/Medicina/CDB/MACI/Components/AS/SECTOR03/LAN10/LAN10.xml
+++ b/Medicina/CDB/MACI/Components/AS/SECTOR03/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="MedicinaActiveSurfaceContainer03" ImplLang="cpp">
-      <_ Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
-      <_ Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
-      <_ Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
-      <_ Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
-      <_ Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
 
 </HierarchicalComponent>
diff --git a/Medicina/CDB/MACI/Components/AS/SECTOR03/LAN11/LAN11.xml b/Medicina/CDB/MACI/Components/AS/SECTOR03/LAN11/LAN11.xml
index 64f8ff2fb..d361fefa6 100644
--- a/Medicina/CDB/MACI/Components/AS/SECTOR03/LAN11/LAN11.xml
+++ b/Medicina/CDB/MACI/Components/AS/SECTOR03/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="MedicinaActiveSurfaceContainer03" ImplLang="cpp">
-      <_ Name="USD01"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
-      <_ Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
-      <_ Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
-      <_ Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
-      <_ Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
-      <_ Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD01"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
 
 </HierarchicalComponent>
diff --git a/Medicina/CDB/MACI/Components/AS/SECTOR03/LAN12/LAN12.xml b/Medicina/CDB/MACI/Components/AS/SECTOR03/LAN12/LAN12.xml
index 6f12e020f..00de5dd7b 100644
--- a/Medicina/CDB/MACI/Components/AS/SECTOR03/LAN12/LAN12.xml
+++ b/Medicina/CDB/MACI/Components/AS/SECTOR03/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="MedicinaActiveSurfaceContainer03" ImplLang="cpp">
-      <_ Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
-      <_ Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
-      <_ Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
-      <_ Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
-      <_ Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
 
 </HierarchicalComponent>
diff --git a/Medicina/CDB/MACI/Components/AS/SECTOR04/LAN01/LAN01.xml b/Medicina/CDB/MACI/Components/AS/SECTOR04/LAN01/LAN01.xml
index 1c80c6513..df5dc602b 100644
--- a/Medicina/CDB/MACI/Components/AS/SECTOR04/LAN01/LAN01.xml
+++ b/Medicina/CDB/MACI/Components/AS/SECTOR04/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="MedicinaActiveSurfaceContainer04" ImplLang="cpp">
-      <_ Name="USD01"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
-      <_ Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
-      <_ Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
-      <_ Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
-      <_ Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
-      <_ Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD01"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
 
 </HierarchicalComponent>
diff --git a/Medicina/CDB/MACI/Components/AS/SECTOR04/LAN02/LAN02.xml b/Medicina/CDB/MACI/Components/AS/SECTOR04/LAN02/LAN02.xml
index 3a726ace1..d1107a5ac 100644
--- a/Medicina/CDB/MACI/Components/AS/SECTOR04/LAN02/LAN02.xml
+++ b/Medicina/CDB/MACI/Components/AS/SECTOR04/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="MedicinaActiveSurfaceContainer04" ImplLang="cpp">
-      <_ Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
-      <_ Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
-      <_ Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
-      <_ Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
-      <_ Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
 
 </HierarchicalComponent>
diff --git a/Medicina/CDB/MACI/Components/AS/SECTOR04/LAN03/LAN03.xml b/Medicina/CDB/MACI/Components/AS/SECTOR04/LAN03/LAN03.xml
index 8970cfae2..11a3dde61 100644
--- a/Medicina/CDB/MACI/Components/AS/SECTOR04/LAN03/LAN03.xml
+++ b/Medicina/CDB/MACI/Components/AS/SECTOR04/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="MedicinaActiveSurfaceContainer04" ImplLang="cpp">
-      <_ Name="USD01"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
-      <_ Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
-      <_ Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
-      <_ Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
-      <_ Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
-      <_ Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD01"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
 
 </HierarchicalComponent>
diff --git a/Medicina/CDB/MACI/Components/AS/SECTOR04/LAN04/LAN04.xml b/Medicina/CDB/MACI/Components/AS/SECTOR04/LAN04/LAN04.xml
index c5d8eb7b5..1041a83ae 100644
--- a/Medicina/CDB/MACI/Components/AS/SECTOR04/LAN04/LAN04.xml
+++ b/Medicina/CDB/MACI/Components/AS/SECTOR04/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="MedicinaActiveSurfaceContainer04" ImplLang="cpp">
-      <_ Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
-      <_ Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
-      <_ Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
-      <_ Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
-      <_ Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
 
 </HierarchicalComponent>
diff --git a/Medicina/CDB/MACI/Components/AS/SECTOR04/LAN05/LAN05.xml b/Medicina/CDB/MACI/Components/AS/SECTOR04/LAN05/LAN05.xml
index aff7ae2c1..3011f8e99 100644
--- a/Medicina/CDB/MACI/Components/AS/SECTOR04/LAN05/LAN05.xml
+++ b/Medicina/CDB/MACI/Components/AS/SECTOR04/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="MedicinaActiveSurfaceContainer04" ImplLang="cpp">
-      <_ Name="USD01"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
-      <_ Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
-      <_ Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
-      <_ Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
-      <_ Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
-      <_ Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD01"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
 
 </HierarchicalComponent>
diff --git a/Medicina/CDB/MACI/Components/AS/SECTOR04/LAN06/LAN06.xml b/Medicina/CDB/MACI/Components/AS/SECTOR04/LAN06/LAN06.xml
index 88763b92a..43b42d3a5 100644
--- a/Medicina/CDB/MACI/Components/AS/SECTOR04/LAN06/LAN06.xml
+++ b/Medicina/CDB/MACI/Components/AS/SECTOR04/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="MedicinaActiveSurfaceContainer04" ImplLang="cpp">
-      <_ Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
-      <_ Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
-      <_ Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
-      <_ Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
-      <_ Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
 
 </HierarchicalComponent>
diff --git a/Medicina/CDB/MACI/Components/AS/SECTOR04/LAN07/LAN07.xml b/Medicina/CDB/MACI/Components/AS/SECTOR04/LAN07/LAN07.xml
index 560436cc0..8268c02cb 100644
--- a/Medicina/CDB/MACI/Components/AS/SECTOR04/LAN07/LAN07.xml
+++ b/Medicina/CDB/MACI/Components/AS/SECTOR04/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="MedicinaActiveSurfaceContainer04" ImplLang="cpp">
-      <_ Name="USD01"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
-      <_ Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
-      <_ Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
-      <_ Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
-      <_ Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
-      <_ Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
-      <_ Name="USD07"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD01"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD07"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
 
 </HierarchicalComponent>
diff --git a/Medicina/CDB/MACI/Components/AS/SECTOR04/LAN08/LAN08.xml b/Medicina/CDB/MACI/Components/AS/SECTOR04/LAN08/LAN08.xml
index 60e4181b6..8374e04d3 100644
--- a/Medicina/CDB/MACI/Components/AS/SECTOR04/LAN08/LAN08.xml
+++ b/Medicina/CDB/MACI/Components/AS/SECTOR04/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="MedicinaActiveSurfaceContainer04" ImplLang="cpp">
-      <_ Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
-      <_ Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
-      <_ Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
-      <_ Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
-      <_ Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
 
 </HierarchicalComponent>
diff --git a/Medicina/CDB/MACI/Components/AS/SECTOR04/LAN09/LAN09.xml b/Medicina/CDB/MACI/Components/AS/SECTOR04/LAN09/LAN09.xml
index 823f6d8f6..a1106f3a3 100644
--- a/Medicina/CDB/MACI/Components/AS/SECTOR04/LAN09/LAN09.xml
+++ b/Medicina/CDB/MACI/Components/AS/SECTOR04/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="MedicinaActiveSurfaceContainer04" ImplLang="cpp">
-      <_ Name="USD01"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
-      <_ Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
-      <_ Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
-      <_ Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
-      <_ Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
-      <_ Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD01"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
 
 </HierarchicalComponent>
diff --git a/Medicina/CDB/MACI/Components/AS/SECTOR04/LAN10/LAN10.xml b/Medicina/CDB/MACI/Components/AS/SECTOR04/LAN10/LAN10.xml
index 1a3f3c0ba..e5358b366 100644
--- a/Medicina/CDB/MACI/Components/AS/SECTOR04/LAN10/LAN10.xml
+++ b/Medicina/CDB/MACI/Components/AS/SECTOR04/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="MedicinaActiveSurfaceContainer04" ImplLang="cpp">
-      <_ Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
-      <_ Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
-      <_ Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
-      <_ Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
-      <_ Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
 
 </HierarchicalComponent>
diff --git a/Medicina/CDB/MACI/Components/AS/SECTOR04/LAN11/LAN11.xml b/Medicina/CDB/MACI/Components/AS/SECTOR04/LAN11/LAN11.xml
index 91b503685..4f25815de 100644
--- a/Medicina/CDB/MACI/Components/AS/SECTOR04/LAN11/LAN11.xml
+++ b/Medicina/CDB/MACI/Components/AS/SECTOR04/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="MedicinaActiveSurfaceContainer04" ImplLang="cpp">
-      <_ Name="USD01"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
-      <_ Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
-      <_ Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
-      <_ Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
-      <_ Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
-      <_ Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD01"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
 
 </HierarchicalComponent>
diff --git a/Medicina/CDB/MACI/Components/AS/SECTOR04/LAN12/LAN12.xml b/Medicina/CDB/MACI/Components/AS/SECTOR04/LAN12/LAN12.xml
index 13e8c9991..2ca8a2c8d 100644
--- a/Medicina/CDB/MACI/Components/AS/SECTOR04/LAN12/LAN12.xml
+++ b/Medicina/CDB/MACI/Components/AS/SECTOR04/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="MedicinaActiveSurfaceContainer04" ImplLang="cpp">
-      <_ Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
-      <_ Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
-      <_ Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
-      <_ Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
-      <_ Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
 
 </HierarchicalComponent>
diff --git a/Medicina/CDB/MACI/Containers/MedicinaActiveSurfaceContainer/MedicinaActiveSurfaceContainer.xml b/Medicina/CDB/MACI/Containers/MedicinaActiveSurfaceContainer/MedicinaActiveSurfaceContainer.xml
index 8dfd82ea8..749ef249b 100644
--- a/Medicina/CDB/MACI/Containers/MedicinaActiveSurfaceContainer/MedicinaActiveSurfaceContainer.xml
+++ b/Medicina/CDB/MACI/Containers/MedicinaActiveSurfaceContainer/MedicinaActiveSurfaceContainer.xml
@@ -11,7 +11,7 @@
 	ServerThreads="5">
 
 	<Autoload>
-		<cdb:_ string="baci" />
+		<cdb:e string="baci" />
 	</Autoload>
 
 	<LoggingConfig
diff --git a/Medicina/CDB/MACI/Containers/MedicinaActiveSurfaceContainer01/MedicinaActiveSurfaceContainer01.xml b/Medicina/CDB/MACI/Containers/MedicinaActiveSurfaceContainer01/MedicinaActiveSurfaceContainer01.xml
index 62ca03e37..9fecba35d 100644
--- a/Medicina/CDB/MACI/Containers/MedicinaActiveSurfaceContainer01/MedicinaActiveSurfaceContainer01.xml
+++ b/Medicina/CDB/MACI/Containers/MedicinaActiveSurfaceContainer01/MedicinaActiveSurfaceContainer01.xml
@@ -11,7 +11,7 @@
 	ImplLang="cpp">
 
 	<Autoload>
-		<cdb:_ string="baci" />
+		<cdb:e string="baci" />
 	</Autoload>
 
 	<LoggingConfig
diff --git a/Medicina/CDB/MACI/Containers/MedicinaActiveSurfaceContainer02/MedicinaActiveSurfaceContainer02.xml b/Medicina/CDB/MACI/Containers/MedicinaActiveSurfaceContainer02/MedicinaActiveSurfaceContainer02.xml
index 8b5644f5b..f994d42ca 100644
--- a/Medicina/CDB/MACI/Containers/MedicinaActiveSurfaceContainer02/MedicinaActiveSurfaceContainer02.xml
+++ b/Medicina/CDB/MACI/Containers/MedicinaActiveSurfaceContainer02/MedicinaActiveSurfaceContainer02.xml
@@ -11,7 +11,7 @@
 	ImplLang="cpp">
 
 	<Autoload>
-		<cdb:_ string="baci" />
+		<cdb:e string="baci" />
 	</Autoload>
 
 	<LoggingConfig
diff --git a/Medicina/CDB/MACI/Containers/MedicinaActiveSurfaceContainer03/MedicinaActiveSurfaceContainer03.xml b/Medicina/CDB/MACI/Containers/MedicinaActiveSurfaceContainer03/MedicinaActiveSurfaceContainer03.xml
index 8b5644f5b..f994d42ca 100644
--- a/Medicina/CDB/MACI/Containers/MedicinaActiveSurfaceContainer03/MedicinaActiveSurfaceContainer03.xml
+++ b/Medicina/CDB/MACI/Containers/MedicinaActiveSurfaceContainer03/MedicinaActiveSurfaceContainer03.xml
@@ -11,7 +11,7 @@
 	ImplLang="cpp">
 
 	<Autoload>
-		<cdb:_ string="baci" />
+		<cdb:e string="baci" />
 	</Autoload>
 
 	<LoggingConfig
diff --git a/Medicina/CDB/MACI/Containers/MedicinaActiveSurfaceContainer04/MedicinaActiveSurfaceContainer04.xml b/Medicina/CDB/MACI/Containers/MedicinaActiveSurfaceContainer04/MedicinaActiveSurfaceContainer04.xml
index 8b5644f5b..f994d42ca 100644
--- a/Medicina/CDB/MACI/Containers/MedicinaActiveSurfaceContainer04/MedicinaActiveSurfaceContainer04.xml
+++ b/Medicina/CDB/MACI/Containers/MedicinaActiveSurfaceContainer04/MedicinaActiveSurfaceContainer04.xml
@@ -11,7 +11,7 @@
 	ImplLang="cpp">
 
 	<Autoload>
-		<cdb:_ string="baci" />
+		<cdb:e string="baci" />
 	</Autoload>
 
 	<LoggingConfig
diff --git a/Medicina/CDB/alma/AS/Boss/Boss.xml b/Medicina/CDB/alma/AS/Boss/Boss.xml
index f563c590d..5c42a5928 100644
--- a/Medicina/CDB/alma/AS/Boss/Boss.xml
+++ b/Medicina/CDB/alma/AS/Boss/Boss.xml
@@ -22,9 +22,9 @@
    -   Wed Mar 17 13:51:15 UTC 2021 modified by jDAL
    -   Wed Mar 17 13:52:12 UTC 2021 modified by jDAL
 -->
-<MedicinaActiveSurfaceBoss xmlns="urn:schemas-cosylab-com:MedicinaActiveSurfaceBoss:1.0" xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" WatchingThreadTime="200000" RepetitionCacheTime="2000000" RepetitionExpireTime="5000000" profile="2">
+<MedicinaActiveSurfaceBoss xmlns="urn:schemas-cosylab-com:MedicinaActiveSurfaceBoss:1.0" xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" WatchingThreadTime="200000" WorkingThreadTime="500000" RepetitionCacheTime="2000000" RepetitionExpireTime="5000000" profile="4">
 	<status />
 	<enabled />
 	<pprofile />
 	<tracking />
-</MedicinaActiveSurfaceBoss>
\ No newline at end of file
+</MedicinaActiveSurfaceBoss>
diff --git a/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR01/LAN01/LAN01.xml b/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR01/LAN01/LAN01.xml
index b731bc5f2..bbe97f872 100644
--- a/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR01/LAN01/LAN01.xml
+++ b/Medicina/Configuration/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="MedicinaActiveSurfaceContainer01" ImplLang="cpp">
-      <_ Name="USD01"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD01"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
 
 </HierarchicalComponent>
diff --git a/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR01/LAN02/LAN02.xml b/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR01/LAN02/LAN02.xml
index d431b18f6..ee657b93e 100644
--- a/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR01/LAN02/LAN02.xml
+++ b/Medicina/Configuration/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="MedicinaActiveSurfaceContainer01" ImplLang="cpp">
-      <_ Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
 
 </HierarchicalComponent>
diff --git a/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR01/LAN03/LAN03.xml b/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR01/LAN03/LAN03.xml
index baa2b0e94..e7a13dad9 100644
--- a/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR01/LAN03/LAN03.xml
+++ b/Medicina/Configuration/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="MedicinaActiveSurfaceContainer01" ImplLang="cpp">
-      <_ Name="USD01"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD01"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
 
 </HierarchicalComponent>
diff --git a/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR01/LAN04/LAN04.xml b/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR01/LAN04/LAN04.xml
index 87e72a6e0..43c71c39b 100644
--- a/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR01/LAN04/LAN04.xml
+++ b/Medicina/Configuration/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="MedicinaActiveSurfaceContainer01" ImplLang="cpp">
-      <_ Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
 
 </HierarchicalComponent>
diff --git a/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR01/LAN05/LAN05.xml b/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR01/LAN05/LAN05.xml
index 1a58647b4..98d4e65e4 100644
--- a/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR01/LAN05/LAN05.xml
+++ b/Medicina/Configuration/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="MedicinaActiveSurfaceContainer01" ImplLang="cpp">
-      <_ Name="USD01"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD01"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
 
 </HierarchicalComponent>
diff --git a/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR01/LAN06/LAN06.xml b/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR01/LAN06/LAN06.xml
index 8109d4b9a..7b05fabe0 100644
--- a/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR01/LAN06/LAN06.xml
+++ b/Medicina/Configuration/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="MedicinaActiveSurfaceContainer01" ImplLang="cpp">
-      <_ Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
 
 </HierarchicalComponent>
diff --git a/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR01/LAN07/LAN07.xml b/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR01/LAN07/LAN07.xml
index 890eed68d..8335432c9 100644
--- a/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR01/LAN07/LAN07.xml
+++ b/Medicina/Configuration/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="MedicinaActiveSurfaceContainer01" ImplLang="cpp">
-      <_ Name="USD01"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD07"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD01"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD07"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
 
 </HierarchicalComponent>
diff --git a/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR01/LAN08/LAN08.xml b/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR01/LAN08/LAN08.xml
index d5f96ee09..19ee8a30d 100644
--- a/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR01/LAN08/LAN08.xml
+++ b/Medicina/Configuration/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="MedicinaActiveSurfaceContainer01" ImplLang="cpp">
-      <_ Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
 
 </HierarchicalComponent>
diff --git a/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR01/LAN09/LAN09.xml b/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR01/LAN09/LAN09.xml
index 391b9704e..39dfaf014 100644
--- a/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR01/LAN09/LAN09.xml
+++ b/Medicina/Configuration/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="MedicinaActiveSurfaceContainer01" ImplLang="cpp">
-      <_ Name="USD01"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD01"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
 
 </HierarchicalComponent>
diff --git a/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR01/LAN10/LAN10.xml b/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR01/LAN10/LAN10.xml
index 87dd01511..203e82ba2 100644
--- a/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR01/LAN10/LAN10.xml
+++ b/Medicina/Configuration/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="MedicinaActiveSurfaceContainer01" ImplLang="cpp">
-      <_ Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
 
 </HierarchicalComponent>
diff --git a/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR01/LAN11/LAN11.xml b/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR01/LAN11/LAN11.xml
index dd76e40df..e7d027452 100644
--- a/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR01/LAN11/LAN11.xml
+++ b/Medicina/Configuration/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="MedicinaActiveSurfaceContainer01" ImplLang="cpp">
-      <_ Name="USD01"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD01"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
 
 </HierarchicalComponent>
diff --git a/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR01/LAN12/LAN12.xml b/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR01/LAN12/LAN12.xml
index a0616d642..0f1f87771 100644
--- a/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR01/LAN12/LAN12.xml
+++ b/Medicina/Configuration/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="MedicinaActiveSurfaceContainer01" ImplLang="cpp">
-      <_ Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
-      <_ Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
+      <e Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer01" ImplLang="cpp"/>
 
 </HierarchicalComponent>
diff --git a/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR02/LAN01/LAN01.xml b/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR02/LAN01/LAN01.xml
index 1ffef9e34..4bdf9f755 100644
--- a/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR02/LAN01/LAN01.xml
+++ b/Medicina/Configuration/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="MedicinaActiveSurfaceContainer01" ImplLang="cpp">
-      <_ Name="USD01"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD01"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
 
 </HierarchicalComponent>
diff --git a/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR02/LAN02/LAN02.xml b/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR02/LAN02/LAN02.xml
index ffa584111..1556f12e8 100644
--- a/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR02/LAN02/LAN02.xml
+++ b/Medicina/Configuration/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="MedicinaActiveSurfaceContainer01" ImplLang="cpp">
-      <_ Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
 
 </HierarchicalComponent>
diff --git a/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR02/LAN03/LAN03.xml b/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR02/LAN03/LAN03.xml
index f43bcfe8d..1f21c92ab 100644
--- a/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR02/LAN03/LAN03.xml
+++ b/Medicina/Configuration/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="MedicinaActiveSurfaceContainer02" ImplLang="cpp">
-      <_ Name="USD01"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD01"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
 
 </HierarchicalComponent>
diff --git a/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR02/LAN04/LAN04.xml b/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR02/LAN04/LAN04.xml
index aa56f71c9..ed0f1c208 100644
--- a/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR02/LAN04/LAN04.xml
+++ b/Medicina/Configuration/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="MedicinaActiveSurfaceContainer02" ImplLang="cpp">
-      <_ Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
 
 </HierarchicalComponent>
diff --git a/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR02/LAN05/LAN05.xml b/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR02/LAN05/LAN05.xml
index 2cacfccbb..a81d3a278 100644
--- a/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR02/LAN05/LAN05.xml
+++ b/Medicina/Configuration/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="MedicinaActiveSurfaceContainer02" ImplLang="cpp">
-      <_ Name="USD01"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD01"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
 
 </HierarchicalComponent>
diff --git a/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR02/LAN06/LAN06.xml b/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR02/LAN06/LAN06.xml
index e1fa8d036..1796ff38d 100644
--- a/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR02/LAN06/LAN06.xml
+++ b/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR02/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="MedicinaActiveSurfaceContainer02" ImplLang="cpp">
-      <_ Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
 
 </HierarchicalComponent>
diff --git a/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR02/LAN07/LAN07.xml b/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR02/LAN07/LAN07.xml
index f6d0a4f64..56affd411 100644
--- a/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR02/LAN07/LAN07.xml
+++ b/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR02/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="MedicinaActiveSurfaceContainer02" ImplLang="cpp">
-      <_ Name="USD01"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD07"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD01"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD07"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
 
 </HierarchicalComponent>
diff --git a/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR02/LAN08/LAN08.xml b/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR02/LAN08/LAN08.xml
index 104be2efe..a08378c74 100644
--- a/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR02/LAN08/LAN08.xml
+++ b/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR02/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="MedicinaActiveSurfaceContainer02" ImplLang="cpp">
-      <_ Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
 
 </HierarchicalComponent>
diff --git a/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR02/LAN09/LAN09.xml b/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR02/LAN09/LAN09.xml
index 4dc436b35..8d88f2866 100644
--- a/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR02/LAN09/LAN09.xml
+++ b/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR02/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="MedicinaActiveSurfaceContainer02" ImplLang="cpp">
-      <_ Name="USD01"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD01"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
 
 </HierarchicalComponent>
diff --git a/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR02/LAN10/LAN10.xml b/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR02/LAN10/LAN10.xml
index c544bb661..30b69e097 100644
--- a/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR02/LAN10/LAN10.xml
+++ b/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR02/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="MedicinaActiveSurfaceContainer02" ImplLang="cpp">
-      <_ Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
 
 </HierarchicalComponent>
diff --git a/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR02/LAN11/LAN11.xml b/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR02/LAN11/LAN11.xml
index 6f4663cb4..98e722282 100644
--- a/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR02/LAN11/LAN11.xml
+++ b/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR02/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="MedicinaActiveSurfaceContainer02" ImplLang="cpp">
-      <_ Name="USD01"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD01"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
 
 </HierarchicalComponent>
diff --git a/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR02/LAN12/LAN12.xml b/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR02/LAN12/LAN12.xml
index 54f04d1e6..28ddc74b2 100644
--- a/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR02/LAN12/LAN12.xml
+++ b/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR02/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="MedicinaActiveSurfaceContainer02" ImplLang="cpp">
-      <_ Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
-      <_ Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
+      <e Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer02" ImplLang="cpp"/>
 
 </HierarchicalComponent>
diff --git a/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR03/LAN01/LAN01.xml b/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR03/LAN01/LAN01.xml
index 8cc2514a7..8fda36ea5 100644
--- a/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR03/LAN01/LAN01.xml
+++ b/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR03/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="MedicinaActiveSurfaceContainer03" ImplLang="cpp">
-      <_ Name="USD01"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
-      <_ Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
-      <_ Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
-      <_ Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
-      <_ Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
-      <_ Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD01"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
 
 </HierarchicalComponent>
diff --git a/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR03/LAN02/LAN02.xml b/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR03/LAN02/LAN02.xml
index 2930fd549..82cbb8b87 100644
--- a/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR03/LAN02/LAN02.xml
+++ b/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR03/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="MedicinaActiveSurfaceContainer03" ImplLang="cpp">
-      <_ Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
-      <_ Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
-      <_ Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
-      <_ Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
-      <_ Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
 
 </HierarchicalComponent>
diff --git a/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR03/LAN03/LAN03.xml b/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR03/LAN03/LAN03.xml
index dec50ed50..1ded634d5 100644
--- a/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR03/LAN03/LAN03.xml
+++ b/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR03/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="MedicinaActiveSurfaceContainer03" ImplLang="cpp">
-      <_ Name="USD01"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
-      <_ Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
-      <_ Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
-      <_ Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
-      <_ Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
-      <_ Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD01"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
 
 </HierarchicalComponent>
diff --git a/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR03/LAN04/LAN04.xml b/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR03/LAN04/LAN04.xml
index 2b7de7b3e..71a15facb 100644
--- a/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR03/LAN04/LAN04.xml
+++ b/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR03/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="MedicinaActiveSurfaceContainer03" ImplLang="cpp">
-      <_ Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
-      <_ Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
-      <_ Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
-      <_ Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
-      <_ Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
 
 </HierarchicalComponent>
diff --git a/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR03/LAN05/LAN05.xml b/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR03/LAN05/LAN05.xml
index 2b7388648..e781a84a9 100644
--- a/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR03/LAN05/LAN05.xml
+++ b/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR03/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="MedicinaActiveSurfaceContainer03" ImplLang="cpp">
-      <_ Name="USD01"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
-      <_ Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
-      <_ Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
-      <_ Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
-      <_ Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
-      <_ Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD01"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
 
 </HierarchicalComponent>
diff --git a/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR03/LAN06/LAN06.xml b/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR03/LAN06/LAN06.xml
index e5d2ec2f6..9498f0415 100644
--- a/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR03/LAN06/LAN06.xml
+++ b/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR03/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="MedicinaActiveSurfaceContainer03" ImplLang="cpp">
-      <_ Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
-      <_ Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
-      <_ Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
-      <_ Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
-      <_ Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
 
 </HierarchicalComponent>
diff --git a/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR03/LAN07/LAN07.xml b/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR03/LAN07/LAN07.xml
index 19ea4d0ea..bffcb99a3 100644
--- a/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR03/LAN07/LAN07.xml
+++ b/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR03/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="MedicinaActiveSurfaceContainer03" ImplLang="cpp">
-      <_ Name="USD01"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
-      <_ Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
-      <_ Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
-      <_ Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
-      <_ Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
-      <_ Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
-      <_ Name="USD07"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD01"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD07"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
 
 </HierarchicalComponent>
diff --git a/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR03/LAN08/LAN08.xml b/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR03/LAN08/LAN08.xml
index 7d473ed93..a9c92f964 100644
--- a/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR03/LAN08/LAN08.xml
+++ b/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR03/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="MedicinaActiveSurfaceContainer03" ImplLang="cpp">
-      <_ Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
-      <_ Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
-      <_ Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
-      <_ Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
-      <_ Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
 
 </HierarchicalComponent>
diff --git a/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR03/LAN09/LAN09.xml b/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR03/LAN09/LAN09.xml
index 091eab441..1d4e0a1d4 100644
--- a/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR03/LAN09/LAN09.xml
+++ b/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR03/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="MedicinaActiveSurfaceContainer03" ImplLang="cpp">
-      <_ Name="USD01"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
-      <_ Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
-      <_ Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
-      <_ Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
-      <_ Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
-      <_ Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD01"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
 
 </HierarchicalComponent>
diff --git a/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR03/LAN10/LAN10.xml b/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR03/LAN10/LAN10.xml
index 8849be343..740115c05 100644
--- a/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR03/LAN10/LAN10.xml
+++ b/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR03/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="MedicinaActiveSurfaceContainer03" ImplLang="cpp">
-      <_ Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
-      <_ Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
-      <_ Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
-      <_ Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
-      <_ Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
 
 </HierarchicalComponent>
diff --git a/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR03/LAN11/LAN11.xml b/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR03/LAN11/LAN11.xml
index 64f8ff2fb..d361fefa6 100644
--- a/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR03/LAN11/LAN11.xml
+++ b/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR03/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="MedicinaActiveSurfaceContainer03" ImplLang="cpp">
-      <_ Name="USD01"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
-      <_ Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
-      <_ Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
-      <_ Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
-      <_ Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
-      <_ Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD01"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
 
 </HierarchicalComponent>
diff --git a/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR03/LAN12/LAN12.xml b/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR03/LAN12/LAN12.xml
index 6f12e020f..00de5dd7b 100644
--- a/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR03/LAN12/LAN12.xml
+++ b/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR03/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="MedicinaActiveSurfaceContainer03" ImplLang="cpp">
-      <_ Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
-      <_ Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
-      <_ Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
-      <_ Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
-      <_ Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
+      <e Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer03" ImplLang="cpp"/>
 
 </HierarchicalComponent>
diff --git a/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR04/LAN01/LAN01.xml b/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR04/LAN01/LAN01.xml
index 1c80c6513..df5dc602b 100644
--- a/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR04/LAN01/LAN01.xml
+++ b/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR04/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="MedicinaActiveSurfaceContainer04" ImplLang="cpp">
-      <_ Name="USD01"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
-      <_ Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
-      <_ Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
-      <_ Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
-      <_ Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
-      <_ Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD01"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
 
 </HierarchicalComponent>
diff --git a/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR04/LAN02/LAN02.xml b/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR04/LAN02/LAN02.xml
index 3a726ace1..d1107a5ac 100644
--- a/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR04/LAN02/LAN02.xml
+++ b/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR04/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="MedicinaActiveSurfaceContainer04" ImplLang="cpp">
-      <_ Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
-      <_ Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
-      <_ Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
-      <_ Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
-      <_ Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
 
 </HierarchicalComponent>
diff --git a/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR04/LAN03/LAN03.xml b/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR04/LAN03/LAN03.xml
index 8970cfae2..11a3dde61 100644
--- a/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR04/LAN03/LAN03.xml
+++ b/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR04/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="MedicinaActiveSurfaceContainer04" ImplLang="cpp">
-      <_ Name="USD01"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
-      <_ Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
-      <_ Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
-      <_ Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
-      <_ Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
-      <_ Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD01"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
 
 </HierarchicalComponent>
diff --git a/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR04/LAN04/LAN04.xml b/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR04/LAN04/LAN04.xml
index c5d8eb7b5..1041a83ae 100644
--- a/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR04/LAN04/LAN04.xml
+++ b/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR04/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="MedicinaActiveSurfaceContainer04" ImplLang="cpp">
-      <_ Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
-      <_ Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
-      <_ Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
-      <_ Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
-      <_ Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
 
 </HierarchicalComponent>
diff --git a/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR04/LAN05/LAN05.xml b/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR04/LAN05/LAN05.xml
index aff7ae2c1..3011f8e99 100644
--- a/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR04/LAN05/LAN05.xml
+++ b/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR04/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="MedicinaActiveSurfaceContainer04" ImplLang="cpp">
-      <_ Name="USD01"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
-      <_ Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
-      <_ Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
-      <_ Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
-      <_ Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
-      <_ Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD01"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
 
 </HierarchicalComponent>
diff --git a/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR04/LAN06/LAN06.xml b/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR04/LAN06/LAN06.xml
index 88763b92a..43b42d3a5 100644
--- a/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR04/LAN06/LAN06.xml
+++ b/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR04/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="MedicinaActiveSurfaceContainer04" ImplLang="cpp">
-      <_ Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
-      <_ Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
-      <_ Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
-      <_ Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
-      <_ Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
 
 </HierarchicalComponent>
diff --git a/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR04/LAN07/LAN07.xml b/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR04/LAN07/LAN07.xml
index 560436cc0..8268c02cb 100644
--- a/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR04/LAN07/LAN07.xml
+++ b/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR04/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="MedicinaActiveSurfaceContainer04" ImplLang="cpp">
-      <_ Name="USD01"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
-      <_ Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
-      <_ Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
-      <_ Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
-      <_ Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
-      <_ Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
-      <_ Name="USD07"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD01"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD07"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
 
 </HierarchicalComponent>
diff --git a/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR04/LAN08/LAN08.xml b/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR04/LAN08/LAN08.xml
index 60e4181b6..8374e04d3 100644
--- a/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR04/LAN08/LAN08.xml
+++ b/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR04/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="MedicinaActiveSurfaceContainer04" ImplLang="cpp">
-      <_ Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
-      <_ Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
-      <_ Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
-      <_ Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
-      <_ Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
 
 </HierarchicalComponent>
diff --git a/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR04/LAN09/LAN09.xml b/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR04/LAN09/LAN09.xml
index 823f6d8f6..a1106f3a3 100644
--- a/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR04/LAN09/LAN09.xml
+++ b/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR04/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="MedicinaActiveSurfaceContainer04" ImplLang="cpp">
-      <_ Name="USD01"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
-      <_ Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
-      <_ Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
-      <_ Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
-      <_ Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
-      <_ Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD01"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
 
 </HierarchicalComponent>
diff --git a/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR04/LAN10/LAN10.xml b/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR04/LAN10/LAN10.xml
index 1a3f3c0ba..e5358b366 100644
--- a/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR04/LAN10/LAN10.xml
+++ b/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR04/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="MedicinaActiveSurfaceContainer04" ImplLang="cpp">
-      <_ Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
-      <_ Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
-      <_ Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
-      <_ Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
-      <_ Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
 
 </HierarchicalComponent>
diff --git a/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR04/LAN11/LAN11.xml b/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR04/LAN11/LAN11.xml
index 91b503685..4f25815de 100644
--- a/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR04/LAN11/LAN11.xml
+++ b/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR04/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="MedicinaActiveSurfaceContainer04" ImplLang="cpp">
-      <_ Name="USD01"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
-      <_ Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
-      <_ Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
-      <_ Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
-      <_ Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
-      <_ Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD01"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
 
 </HierarchicalComponent>
diff --git a/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR04/LAN12/LAN12.xml b/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR04/LAN12/LAN12.xml
index 13e8c9991..2ca8a2c8d 100644
--- a/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR04/LAN12/LAN12.xml
+++ b/Medicina/Configuration/CDB/MACI/Components/AS/SECTOR04/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="MedicinaActiveSurfaceContainer04" ImplLang="cpp">
-      <_ Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
-      <_ Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
-      <_ Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
-      <_ Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
-      <_ Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD02"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD03"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD04"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD05"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
+      <e Name="USD06"  Code="ActiveSurfaceUSDImpl"  Type="IDL:alma/ActiveSurface/USD:1.0"	Container="MedicinaActiveSurfaceContainer04" ImplLang="cpp"/>
 
 </HierarchicalComponent>
diff --git a/Medicina/Configuration/CDB/MACI/Containers/MedicinaActiveSurfaceContainer/MedicinaActiveSurfaceContainer.xml b/Medicina/Configuration/CDB/MACI/Containers/MedicinaActiveSurfaceContainer/MedicinaActiveSurfaceContainer.xml
index 8dfd82ea8..749ef249b 100644
--- a/Medicina/Configuration/CDB/MACI/Containers/MedicinaActiveSurfaceContainer/MedicinaActiveSurfaceContainer.xml
+++ b/Medicina/Configuration/CDB/MACI/Containers/MedicinaActiveSurfaceContainer/MedicinaActiveSurfaceContainer.xml
@@ -11,7 +11,7 @@
 	ServerThreads="5">
 
 	<Autoload>
-		<cdb:_ string="baci" />
+		<cdb:e string="baci" />
 	</Autoload>
 
 	<LoggingConfig
diff --git a/Medicina/Configuration/CDB/MACI/Containers/MedicinaActiveSurfaceContainer01/MedicinaActiveSurfaceContainer01.xml b/Medicina/Configuration/CDB/MACI/Containers/MedicinaActiveSurfaceContainer01/MedicinaActiveSurfaceContainer01.xml
index 62ca03e37..9fecba35d 100644
--- a/Medicina/Configuration/CDB/MACI/Containers/MedicinaActiveSurfaceContainer01/MedicinaActiveSurfaceContainer01.xml
+++ b/Medicina/Configuration/CDB/MACI/Containers/MedicinaActiveSurfaceContainer01/MedicinaActiveSurfaceContainer01.xml
@@ -11,7 +11,7 @@
 	ImplLang="cpp">
 
 	<Autoload>
-		<cdb:_ string="baci" />
+		<cdb:e string="baci" />
 	</Autoload>
 
 	<LoggingConfig
diff --git a/Medicina/Configuration/CDB/MACI/Containers/MedicinaActiveSurfaceContainer02/MedicinaActiveSurfaceContainer02.xml b/Medicina/Configuration/CDB/MACI/Containers/MedicinaActiveSurfaceContainer02/MedicinaActiveSurfaceContainer02.xml
index 8b5644f5b..f994d42ca 100644
--- a/Medicina/Configuration/CDB/MACI/Containers/MedicinaActiveSurfaceContainer02/MedicinaActiveSurfaceContainer02.xml
+++ b/Medicina/Configuration/CDB/MACI/Containers/MedicinaActiveSurfaceContainer02/MedicinaActiveSurfaceContainer02.xml
@@ -11,7 +11,7 @@
 	ImplLang="cpp">
 
 	<Autoload>
-		<cdb:_ string="baci" />
+		<cdb:e string="baci" />
 	</Autoload>
 
 	<LoggingConfig
diff --git a/Medicina/Configuration/CDB/MACI/Containers/MedicinaActiveSurfaceContainer03/MedicinaActiveSurfaceContainer03.xml b/Medicina/Configuration/CDB/MACI/Containers/MedicinaActiveSurfaceContainer03/MedicinaActiveSurfaceContainer03.xml
index 8b5644f5b..f994d42ca 100644
--- a/Medicina/Configuration/CDB/MACI/Containers/MedicinaActiveSurfaceContainer03/MedicinaActiveSurfaceContainer03.xml
+++ b/Medicina/Configuration/CDB/MACI/Containers/MedicinaActiveSurfaceContainer03/MedicinaActiveSurfaceContainer03.xml
@@ -11,7 +11,7 @@
 	ImplLang="cpp">
 
 	<Autoload>
-		<cdb:_ string="baci" />
+		<cdb:e string="baci" />
 	</Autoload>
 
 	<LoggingConfig
diff --git a/Medicina/Configuration/CDB/MACI/Containers/MedicinaActiveSurfaceContainer04/MedicinaActiveSurfaceContainer04.xml b/Medicina/Configuration/CDB/MACI/Containers/MedicinaActiveSurfaceContainer04/MedicinaActiveSurfaceContainer04.xml
index 8b5644f5b..f994d42ca 100644
--- a/Medicina/Configuration/CDB/MACI/Containers/MedicinaActiveSurfaceContainer04/MedicinaActiveSurfaceContainer04.xml
+++ b/Medicina/Configuration/CDB/MACI/Containers/MedicinaActiveSurfaceContainer04/MedicinaActiveSurfaceContainer04.xml
@@ -11,7 +11,7 @@
 	ImplLang="cpp">
 
 	<Autoload>
-		<cdb:_ string="baci" />
+		<cdb:e string="baci" />
 	</Autoload>
 
 	<LoggingConfig
diff --git a/Medicina/Outdated/CDB/MACI/.gitignore b/Medicina/Outdated/CDB/MACI/.gitignore
new file mode 100644
index 000000000..f83a0eb46
--- /dev/null
+++ b/Medicina/Outdated/CDB/MACI/.gitignore
@@ -0,0 +1 @@
+# This file only exists here in order to prevent the directory from being ignored by git if empty
diff --git a/Medicina/Outdated/CDB/alma/.gitignore b/Medicina/Outdated/CDB/alma/.gitignore
new file mode 100644
index 000000000..f83a0eb46
--- /dev/null
+++ b/Medicina/Outdated/CDB/alma/.gitignore
@@ -0,0 +1 @@
+# This file only exists here in order to prevent the directory from being ignored by git if empty
diff --git a/Medicina/CDB/alma/BACKENDS/NoiseGenerator/NoiseGenerator.xml b/Medicina/Outdated/CDB/alma/BACKENDS/NoiseGenerator/NoiseGenerator.xml
similarity index 100%
rename from Medicina/CDB/alma/BACKENDS/NoiseGenerator/NoiseGenerator.xml
rename to Medicina/Outdated/CDB/alma/BACKENDS/NoiseGenerator/NoiseGenerator.xml
diff --git a/Noto/Outdated/CDB/MACI/.gitignore b/Noto/Outdated/CDB/MACI/.gitignore
new file mode 100644
index 000000000..f83a0eb46
--- /dev/null
+++ b/Noto/Outdated/CDB/MACI/.gitignore
@@ -0,0 +1 @@
+# This file only exists here in order to prevent the directory from being ignored by git if empty
diff --git a/Noto/Outdated/CDB/alma/.gitignore b/Noto/Outdated/CDB/alma/.gitignore
new file mode 100644
index 000000000..f83a0eb46
--- /dev/null
+++ b/Noto/Outdated/CDB/alma/.gitignore
@@ -0,0 +1 @@
+# This file only exists here in order to prevent the directory from being ignored by git if empty
diff --git a/SRT/CDB/alma/BACKENDS/XBackends/XBackends.xml b/SRT/CDB/alma/BACKENDS/XBackends/XBackends.xml
deleted file mode 100644
index 26474dca1..000000000
--- a/SRT/CDB/alma/BACKENDS/XBackends/XBackends.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-<!--
-   - History:
-   -   Wed Apr 13 15:18:03 UTC 2005 modified by Andrea Orlati
--->
-<XBackends xmlns="urn:schemas-cosylab-com:XBackends:1.0" 
-               xmlns:baci="urn:schemas-cosylab-com:BACI:1.0"
-               xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"
-               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-               IPAddress="127.0.0.1"
-               Port="1234"
-               Configuration="NNNN"
-               Mode8Bit="0">
-	<time/>
-	<backendName/>
-	<bandWidth/>
-	<frequency/>
-	<sampleRate/>
-	<attenuation/>
-	<polarization/>
-	<bins/>
-	<feed/>
-    <systemTemperature/>
-	<inputSection/>
-	<inputsNumber/>
-	<sectionsNumber/>
-	<integration/>
-	<status/>
-    <busy/>
-    <mode8bit/>
-	<fileName/>
-</XBackends>
diff --git a/SRT/CDB/alma/DataBlock/SRTLPBandReceiver/NoiseMark/NoiseMark.xml b/SRT/CDB/alma/DataBlock/SRTLPBandReceiver/NoiseMark/NoiseMark.xml
deleted file mode 100644
index 73548c457..000000000
--- a/SRT/CDB/alma/DataBlock/SRTLPBandReceiver/NoiseMark/NoiseMark.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<SRTLPBandNoiseMarkLookUpTable xmlns="urn:schemas-cosylab-com:SRTLPBandNoiseMarkLookUpTable:1.0"
-             	xmlns:baci="urn:schemas-cosylab-com:BACI:1.0"
-				xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"
-				xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
-<MarkEntry><Feed>0</Feed><Polarization>LEFT</Polarization><SkyFrequency>310.0</SkyFrequency><NoiseMark>3.40</NoiseMark></MarkEntry>
-<MarkEntry><Feed>0</Feed><Polarization>LEFT</Polarization><SkyFrequency>330.0</SkyFrequency><NoiseMark>3.87</NoiseMark></MarkEntry>
-<MarkEntry><Feed>0</Feed><Polarization>LEFT</Polarization><SkyFrequency>350.0</SkyFrequency><NoiseMark>4.31</NoiseMark></MarkEntry>
-<MarkEntry><Feed>0</Feed><Polarization>LEFT</Polarization><SkyFrequency>380.0</SkyFrequency><NoiseMark>4.81</NoiseMark></MarkEntry>
-<MarkEntry><Feed>0</Feed><Polarization>LEFT</Polarization><SkyFrequency>410.0</SkyFrequency><NoiseMark>5.64</NoiseMark></MarkEntry>
-
-<MarkEntry><Feed>0</Feed><Polarization>RIGHT</Polarization><SkyFrequency>310.0</SkyFrequency><NoiseMark>3.53</NoiseMark></MarkEntry>
-<MarkEntry><Feed>0</Feed><Polarization>RIGHT</Polarization><SkyFrequency>330.0</SkyFrequency><NoiseMark>4.17</NoiseMark></MarkEntry>
-<MarkEntry><Feed>0</Feed><Polarization>RIGHT</Polarization><SkyFrequency>350.0</SkyFrequency><NoiseMark>4.71</NoiseMark></MarkEntry>
-<MarkEntry><Feed>0</Feed><Polarization>RIGHT</Polarization><SkyFrequency>380.0</SkyFrequency><NoiseMark>5.58</NoiseMark></MarkEntry>
-<MarkEntry><Feed>0</Feed><Polarization>RIGHT</Polarization><SkyFrequency>410.0</SkyFrequency><NoiseMark>6.33</NoiseMark></MarkEntry>
-
-<MarkEntry><Feed>1</Feed><Polarization>LEFT</Polarization><SkyFrequency>1300.0</SkyFrequency><NoiseMark>1.73</NoiseMark></MarkEntry>
-<MarkEntry><Feed>1</Feed><Polarization>LEFT</Polarization><SkyFrequency>1400.0</SkyFrequency><NoiseMark>1.65</NoiseMark></MarkEntry>
-<MarkEntry><Feed>1</Feed><Polarization>LEFT</Polarization><SkyFrequency>1500.0</SkyFrequency><NoiseMark>1.89</NoiseMark></MarkEntry>
-<MarkEntry><Feed>1</Feed><Polarization>LEFT</Polarization><SkyFrequency>1600.0</SkyFrequency><NoiseMark>2.15</NoiseMark></MarkEntry>
-<MarkEntry><Feed>1</Feed><Polarization>LEFT</Polarization><SkyFrequency>1700.0</SkyFrequency><NoiseMark>1.97</NoiseMark></MarkEntry>
-<MarkEntry><Feed>1</Feed><Polarization>LEFT</Polarization><SkyFrequency>1800.0</SkyFrequency><NoiseMark>2.28</NoiseMark></MarkEntry>
-
-<MarkEntry><Feed>1</Feed><Polarization>RIGHT</Polarization><SkyFrequency>1300.0</SkyFrequency><NoiseMark>1.50</NoiseMark></MarkEntry>
-<MarkEntry><Feed>1</Feed><Polarization>RIGHT</Polarization><SkyFrequency>1400.0</SkyFrequency><NoiseMark>1.39</NoiseMark></MarkEntry>
-<MarkEntry><Feed>1</Feed><Polarization>RIGHT</Polarization><SkyFrequency>1500.0</SkyFrequency><NoiseMark>1.59</NoiseMark></MarkEntry>
-<MarkEntry><Feed>1</Feed><Polarization>RIGHT</Polarization><SkyFrequency>1600.0</SkyFrequency><NoiseMark>1.60</NoiseMark></MarkEntry>
-<MarkEntry><Feed>1</Feed><Polarization>RIGHT</Polarization><SkyFrequency>1700.0</SkyFrequency><NoiseMark>1.88</NoiseMark></MarkEntry>
-<MarkEntry><Feed>1</Feed><Polarization>RIGHT</Polarization><SkyFrequency>1800.0</SkyFrequency><NoiseMark>2.11</NoiseMark></MarkEntry>
-
-</SRTLPBandNoiseMarkLookUpTable>
diff --git a/SRT/CDB/alma/MINORSERVO/PFP/PFP.xml b/SRT/CDB/alma/MINORSERVO/PFP/PFP.xml
deleted file mode 100644
index 5503ee2fd..000000000
--- a/SRT/CDB/alma/MINORSERVO/PFP/PFP.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-<!--
-   Authors: Giuseppe Carboni giuseppe.carboni@inaf.it
--->
-<SRTProgramTrackMinorServo
-    xmlns="urn:schemas-cosylab-com:SRTMinorServo:1.0"
-    xmlns:baci="urn:schemas-cosylab-com:BACI:1.0"
-    xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    physical_axes="5"
-    virtual_axes="3"
-    max_speed="1, 1, 1"
-    acceleration="1, 1, 1"
-    min_range="0, 0, 0"
-    max_range="0, 0, 0"
-    tracking_delta="1, 1, 1">
-
-    <enabled description="All physical axes enabled" />
-    <drive_cabinet_status description="Drive cabinet status" />
-    <block description="Minor servo in block status" />
-    <operative_mode description="Minor servo operating mode" />
-    <physical_axes description="Number of physical axes" />
-    <physical_axes_enabled description="Sequence, physical axes enabled" />
-    <physical_positions description="Sequence, physical axes positions" />
-    <virtual_axes description="Number of virtual axes" />
-    <plain_virtual_positions description="Sequence, plain virtual axes positions, with offsets" />
-    <virtual_positions description="Sequence, virtual axes positions, without offsets" />
-    <virtual_offsets description="Sequence, sum of user and system virtual axis offsets" />
-    <virtual_user_offsets description="Sequence, virtual user axes offsets" />
-    <virtual_system_offsets description="Sequence, virtual system axes offsets" />
-    <commanded_virtual_positions description="Sequence, latest commanded (via preset) virtual positions" />
-    <in_use description="Boolean indicating whether the servo is in use in the current configuration" />
-    <current_setup description="The name of the current configuration" />
-    <error_code description="The type of error encountered" />
-    <tracking description="Boolean indicating whether the servo is tracking the given coordinates" />
-    <trajectory_id description="Unsigned int, the UNIX Epoch * 1000 indicating the start time of the current trajectory" />
-    <total_trajectory_points description="Number of points sent for the current trajectory" />
-    <remaining_trajectory_points description="Remaining points of the current trahectory" />
-    <tracking_error description="The tracking error of each axis" />
-
-</SRTProgramTrackMinorServo>
diff --git a/SRT/CDB/alma/RECEIVERS/LO1/LO1.xml b/SRT/CDB/alma/RECEIVERS/LO1/LO1.xml
deleted file mode 100644
index 657c8defb..000000000
--- a/SRT/CDB/alma/RECEIVERS/LO1/LO1.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-<!--
-   - History:
-   -   Mon Dec 19 13:09:58 UTC 2011 modified by jDAL
--->
-<LocalOscillator xmlns="urn:schemas-cosylab-com:LocalOscillator:1.0" xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" GPIBBoard="1" PrimaryAddress="19" SecondaryAddress="0" Timeout="10">
-	<frequency units="Mhz" />
-	<amplitude units="dBm" />
-	<isLocked />
-</LocalOscillator>
\ No newline at end of file
diff --git a/SRT/CDB/alma/RECEIVERS/LO_LP/LO_LP.xml b/SRT/CDB/alma/RECEIVERS/LO_LP/LO_LP.xml
deleted file mode 100644
index d8351a7e5..000000000
--- a/SRT/CDB/alma/RECEIVERS/LO_LP/LO_LP.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<LocalOscillator xmlns="urn:schemas-cosylab-com:LocalOscillator:1.0" 
-          xmlns:baci="urn:schemas-cosylab-com:BACI:1.0"
-               xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"
-               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-               GPIBBoard="0" PrimaryAddress="19" SecondaryAddress="0" Timeout="10">
-                
-   
-	<frequency units="MHz"/>
-	<amplitude units="dBm"/>
-	<isLocked/>
-</LocalOscillator>
diff --git a/SRT/CDB/alma/RECEIVERS/SRTIFDistributor/SRTIFDistributor.xml b/SRT/CDB/alma/RECEIVERS/SRTIFDistributor/SRTIFDistributor.xml
deleted file mode 100644
index d91a8cd08..000000000
--- a/SRT/CDB/alma/RECEIVERS/SRTIFDistributor/SRTIFDistributor.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-<SRTIFDistributor
-    xmlns="urn:schemas-cosylab-com:SRTIFDistributor:1.0" 
-    xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" 
-    xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0" 
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    IP="127.0.0.1"
-    PORT="12000"
-    N_BOARDS="21" >
-    <frequency units="MHz" />
-    <amplitude units="dBm" />
-    <isLocked />
-</SRTIFDistributor>
diff --git a/SRT/CDB/alma/RECEIVERS/SRTLPBandReceiver/SRTLPBandReceiver.xml b/SRT/CDB/alma/RECEIVERS/SRTLPBandReceiver/SRTLPBandReceiver.xml
deleted file mode 100755
index 31ba32dd6..000000000
--- a/SRT/CDB/alma/RECEIVERS/SRTLPBandReceiver/SRTLPBandReceiver.xml
+++ /dev/null
@@ -1,456 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-<!-- 
- *  Authors Info
- *  ============
- *  Name:         Marco Buttu
- *  E-mail:       mbuttu@oa-cagliari.inaf.it
--->
-
-<!-- timeout in microseconds -->
-<SRTLPBandReceiver
-    xmlns="urn:schemas-cosylab-com:SRTLPBandReceiver:1.0" 
-    xmlns:baci="urn:schemas-cosylab-com:BACI:1.0" 
-    xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0" 
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-    actionThreadStackSize="2048"
-    monitoringThreadStackSize="4096"
-    DewarIPAddress="127.0.0.1"
-    DewarPort="12904"
-    LNAIPAddress="127.0.0.1"
-    LNAPort="12905"      
-    SwitchIPAddress="127.0.0.1"
-    SwitchPort="12906"      
-    WatchDogResponseTime="10000000"
-    WatchDogSleepTime="10000000"
-    LNASamplingTime="250000"
-    RepetitionCacheTime="7000000"
-    RepetitionExpireTime="10000000"
-    ReceiverName="SRTLPBand"
-    DefaultMode="L3L4"
-    LocalOscillatorInstance="RECEIVERS/LO_LP"
->
-    <LO description="Sequence of local oscillator values for each IF chain" />
-    <feeds description="Number of feeds of the receiver" />
-    <IFs description="Number of Intermediate Frequencies chains coming from each feed" />
-    <polarization description="Sequence of values that identifies the polarization of each IF chains" />    
-    <initialFrequency description="Sequence of the start frequencies for each IF chain (MHz)" 
-                      units="MHz"
-                      format="%6.2f"
-    />  
-    <bandWidth description="Sequence of the band width values for each IF chain (MHz)" 
-               units="MHz"
-               format="%6.2f"
-    />
-    <mode description="Mnemonic code that defines a special working mode of the receiver (MHz)" />
-    <vacuum description="measure of the vacuum"
-            alarm_high_on="5e-3"
-            default_value="5e-7"
-            alarm_high_off="5e-6"
-            alarm_timer_trig="0"
-            alarm_fault_family="BACIProperty"
-            alarm_fault_member="SRTLPBandReceiver"
-            alarm_level="0"
-            default_timer_trig="10"
-            min_timer_trig="1"
-            min_delta_trig="1e-7"
-            units="mBar"
-            format="%e"
-    />
-    <status description="Bit fields that provide the status word of the receiver and component"
-            alarm_mask="777"
-            alarm_trigger="1"
-            alarm_timer_trig="1"
-            alarm_fault_family="BACIProperty"
-            alarm_fault_member="SRTLPBandReceiver"
-            alarm_level="0"
-            default_timer_trig="10"
-            min_timer_trig="1"
-    />  
-    <vdL1 description="drain voltage for the LNA left channel, stage 1"
-          alarm_high_on="1.70"
-          alarm_low_on="1.52"
-          default_value="1.6"
-          alarm_high_off="1.69"
-          alarm_low_off="1.53"
-          alarm_timer_trig="0"
-          alarm_fault_family="BACIProperty"
-          alarm_fault_member="SRTLPBandReceiver"
-          alarm_level="0"
-          default_timer_trig="10"
-          min_timer_trig="1"
-          min_delta_trig="0.05"
-          units="Volts"
-          format="%5.2f"
-    />
-    <vdR1 description="drain voltage for the LNA right channel, stage 1"
-          alarm_high_on="1.70"
-          alarm_low_on="1.52"
-          default_value="1.60"
-          alarm_high_off="1.69"
-          alarm_low_off="1.53"
-          alarm_timer_trig="0"
-          alarm_fault_family="BACIProperty"
-          alarm_fault_member="SRTLPBandReceiver"
-          alarm_level="0"
-          default_timer_trig="10"
-          min_timer_trig="1"
-          min_delta_trig="0.05"
-          units="Volts"
-          format="%5.2f"
-    />
-    <vdL2 description="drain voltage for the LNA left channel, stage 2"
-          alarm_high_on="1.72"
-          alarm_low_on="1.47"
-          default_value="1.6"
-          alarm_high_off="1.71"
-          alarm_low_off="1.48"
-          alarm_timer_trig="0"
-          alarm_fault_family="BACIProperty"
-          alarm_fault_member="SRTLPBandReceiver"
-          alarm_level="0"
-          default_timer_trig="10"
-          min_timer_trig="1"
-          min_delta_trig="0.05"
-          units="Volts"
-          format="%5.2f"
-    />
-
-    <vdR2 description="drain voltage for the LNA right channel, stage 2"
-          alarm_high_on="1.72"
-          alarm_low_on="1.47"
-          default_value="1.6"
-          alarm_high_off="1.71"
-          alarm_low_off="1.48"
-          alarm_timer_trig="0"
-          alarm_fault_family="BACIProperty"
-          alarm_fault_member="SRTLPBandReceiver"
-          alarm_level="0"
-          default_timer_trig="10"
-          min_timer_trig="1"
-          min_delta_trig="0.05"
-          units="Volts"
-          format="%5.2f"
-    />
-
-    <vdL3 description="drain voltage for the LNA left channel, stage 3"
-          alarm_high_on="1.70"
-          alarm_low_on="1.51"
-          default_value="1.60"
-          alarm_high_off="1.69"
-          alarm_low_off="1.52"
-          alarm_timer_trig="0"
-          alarm_fault_family="BACIProperty"
-          alarm_fault_member="SRTLPBandReceiver"
-          alarm_level="0"
-          default_timer_trig="10"
-          min_timer_trig="1"
-          min_delta_trig="0.05"
-          units="Volts"
-          format="%5.2f"
-    />
-
-    <vdR3 description="drain voltage for the LNA right channel, stage 3"
-          alarm_high_on="1.70"
-          alarm_low_on="1.51"
-          default_value="1.60"
-          alarm_high_off="1.69"
-          alarm_low_off="1.52"
-          alarm_timer_trig="0"
-          alarm_fault_family="BACIProperty"
-          alarm_fault_member="SRTLPBandReceiver"
-          alarm_level="0"
-          default_timer_trig="10"
-          min_timer_trig="1"
-          min_delta_trig="0.05"
-          units="Volts"
-          format="%5.2f"
-    />
-
-    <idL1 description="drain current for the LNA left channel, stage 1"
-          alarm_high_on="17.43"
-          alarm_low_on="13.23"
-          default_value="15.00"
-          alarm_high_off="17.40"
-          alarm_low_off="13.26"
-          alarm_timer_trig="0"
-          alarm_fault_family="BACIProperty"
-          alarm_fault_member="SRTLPBandReceiver"
-          alarm_level="0"
-          default_timer_trig="10"
-          min_timer_trig="1"
-          min_delta_trig="0.05"
-          units="Volts"
-          format="%5.2f"
-    />
-
-    <idR1 description="drain current for the LNA right channel, stage 1"
-          alarm_high_on="17.43"
-          alarm_low_on="13.23"
-          default_value="15.00"
-          alarm_high_off="17.40"
-          alarm_low_off="13.26"
-          alarm_timer_trig="0"
-          alarm_fault_family="BACIProperty"
-          alarm_fault_member="SRTLPBandReceiver"
-          alarm_level="0"
-          default_timer_trig="10"
-          min_timer_trig="1"
-          min_delta_trig="0.05"
-          units="Volts"
-          format="%5.2f"
-    />
-
-    <idL2 description="drain current for the LNA left channel, stage 2"
-          alarm_high_on="14.84"
-          alarm_low_on="12.35"
-          default_value="13.50"
-          alarm_high_off="14.80"
-          alarm_low_off="12.40"
-          alarm_timer_trig="0"
-          alarm_fault_family="BACIProperty"
-          alarm_fault_member="SRTLPBandReceiver"
-          alarm_level="0"
-          default_timer_trig="10"
-          min_timer_trig="1"
-          min_delta_trig="0.05"
-          units="Volts"
-          format="%5.2f"
-    />
-
-    <idR2 description="drain current for the LNA right channel, stage 2"
-          alarm_high_on="14.84"
-          alarm_low_on="12.35"
-          default_value="13.50"
-          alarm_high_off="14.80"
-          alarm_low_off="12.40"
-          alarm_timer_trig="0"
-          alarm_fault_family="BACIProperty"
-          alarm_fault_member="SRTLPBandReceiver"
-          alarm_level="0"
-          default_timer_trig="10"
-          min_timer_trig="1"
-          min_delta_trig="0.05"
-          units="Volts"
-          format="%5.2f"
-    />
-
-    <idL3 description="drain current for the LNA left channel, stage 3"
-          alarm_high_on="14.64"
-          alarm_low_on="12.21"
-          default_value="13.00"
-          alarm_high_off="14.60"
-          alarm_low_off="12.25"
-          alarm_timer_trig="0"
-          alarm_fault_family="BACIProperty"
-          alarm_fault_member="SRTLPBandReceiver"
-          alarm_level="0"
-          default_timer_trig="10"
-          min_timer_trig="1"
-          min_delta_trig="0.05"
-          units="Volts"
-          format="%5.2f"
-    />
-
-    <idR3 description="drain current for the LNA right channel, stage 3"
-          alarm_high_on="14.64"
-          alarm_low_on="12.21"
-          default_value="13.00"
-          alarm_high_off="14.60"
-          alarm_low_off="12.25"
-          alarm_timer_trig="0"
-          alarm_fault_family="BACIProperty"
-          alarm_fault_member="SRTLPBandReceiver"
-          alarm_level="0"
-          default_timer_trig="10"
-          min_timer_trig="1"
-          min_delta_trig="0.05"
-          units="Volts"
-          format="%5.2f"
-    />
-
-    <vgL1 description="gate voltage for the LNA left channel, stage 1"
-          alarm_high_on="0.066"
-          alarm_low_on="-0.045"
-          default_value="0.00"
-          alarm_high_off="0.065"
-          alarm_low_off="-0.044"
-          alarm_timer_trig="0"
-          alarm_fault_family="BACIProperty"
-          alarm_fault_member="SRTLPBandReceiver"
-          alarm_level="0"
-          default_timer_trig="10"
-          min_timer_trig="1"
-          min_delta_trig="0.05"
-          units="Volts"
-          format="%5.2f"
-    />
-
-    <vgR1 description="gate voltage for the LNA right channel, stage 1"
-          alarm_high_on="0.066"
-          alarm_low_on="-0.045"
-          default_value="0.00"
-          alarm_high_off="0.065"
-          alarm_low_off="-0.044"
-          alarm_timer_trig="0"
-          alarm_fault_family="BACIProperty"
-          alarm_fault_member="SRTLPBandReceiver"
-          alarm_level="0"
-          default_timer_trig="10"
-          min_timer_trig="1"
-          min_delta_trig="0.05"
-          units="Volts"
-          format="%5.2f"
-    />
-
-    <vgL2 description="gate voltage for the LNA left channel, stage 2"
-          alarm_high_on="0.049"
-          alarm_low_on="-0.090"
-          default_value="0.0"
-          alarm_high_off="0.048"
-          alarm_low_off="-0.089"
-          alarm_timer_trig="0"
-          alarm_fault_family="BACIProperty"
-          alarm_fault_member="SRTLPBandReceiver"
-          alarm_level="0"
-          default_timer_trig="10"
-          min_timer_trig="1"
-          min_delta_trig="0.05"
-          units="Volts"
-          format="%5.2f"
-    />
-
-    <vgR2 description="gate voltage for the LNA right channel, stage 2"
-          alarm_high_on="0.049"
-          alarm_low_on="-0.090"
-          default_value="0.0"
-          alarm_high_off="0.048"
-          alarm_low_off="-0.089"
-          alarm_timer_trig="0"
-          alarm_fault_family="BACIProperty"
-          alarm_fault_member="SRTLPBandReceiver"
-          alarm_level="0"
-          default_timer_trig="10"
-          min_timer_trig="1"
-          min_delta_trig="0.05"
-          units="Volts"
-          format="%5.2f"
-    />
-
-    <vgL3 description="gate voltage for the LNA left channel, stage 3"
-          alarm_high_on="0.052"
-          alarm_low_on="-0.060"
-          default_value="0.55"
-          alarm_high_off="0.51"
-          alarm_low_off="-0.059"
-          alarm_timer_trig="0"
-          alarm_fault_family="BACIProperty"
-          alarm_fault_member="SRTLPBandReceiver"
-          alarm_level="0"
-          default_timer_trig="10"
-          min_timer_trig="1"
-          min_delta_trig="0.05"
-          units="Volts"
-          format="%5.2f"
-    />
-
-    <vgR3 description="gate voltage for the LNA right channel, stage 3"
-          alarm_high_on="0.052"
-          alarm_low_on="-0.060"
-          default_value="0.55"
-          alarm_high_off="0.51"
-          alarm_low_off="-0.059"
-          alarm_timer_trig="0"
-          alarm_fault_family="BACIProperty"
-          alarm_fault_member="SRTLPBandReceiver"
-          alarm_level="0"
-          default_timer_trig="10"
-          min_timer_trig="1"
-          min_delta_trig="0.05"
-          units="Volts"
-          format="%5.2f"
-    />
-    <cryoTemperatureCoolHead description="Cryogenic temperature measured near the cool head"
-          alarm_high_on="91.0"
-          alarm_high_off="90.0"
-          alarm_low_on="75.0"
-          alarm_low_off="76.0"
-          default_value="80.0"
-          alarm_timer_trig="0"
-          alarm_fault_family="BACIProperty"
-          alarm_fault_member="SRTLPBandReceiver"
-          alarm_level="0"
-          default_timer_trig="10"
-          min_timer_trig="1"
-          min_delta_trig="0.5"
-          units="Kelvin"
-          format="%5.1f"                                    
-    />
-    <cryoTemperatureCoolHeadWindow description="Cryogenic temperature measured at cool head window"
-          alarm_high_on="130.0"
-          alarm_high_off="130.0"
-          alarm_low_on="110.0"
-          alarm_low_off="110.0"
-          default_value="120.0"
-          alarm_timer_trig="0"
-          alarm_fault_family="BACIProperty"
-          alarm_fault_member="SRTLPBandReceiver"
-          alarm_level="0"
-          default_timer_trig="10"
-          min_timer_trig="1"
-          min_delta_trig="0.5"
-          units="Kelvin"
-          format="%5.1f"                        
-    />
-    <cryoTemperatureLNA description="Cryogenic temperature measured at the LNA"
-          alarm_high_on="40.0"
-          alarm_high_off="36.0"
-          alarm_low_on="4.0"
-          alarm_low_off="8.0"
-          default_value="15.0"
-          alarm_timer_trig="1.0"
-          alarm_fault_family="BACIProperty"
-          alarm_fault_member="SRTLPBandReceiver"
-          alarm_level="0"
-          default_timer_trig="1.0"
-          min_timer_trig="1"
-          min_delta_trig="0.5"
-          units="Kelvin"
-          format="%5.1f"                                    
-    />
-    <cryoTemperatureLNAWindow description="Cryogenic temperature measured at the LNA window"
-          alarm_high_on="63.0"
-          alarm_high_off="63.0"
-          alarm_low_on="44.0"
-          alarm_low_off="44.0"
-          default_value="55.0"
-          alarm_timer_trig="0"
-          alarm_fault_family="BACIProperty"
-          alarm_fault_member="SRTLPBandReceiver"
-          alarm_level="0"
-          default_timer_trig="10"
-          min_timer_trig="1"
-          min_delta_trig="0.5"
-          units="Kelvin"
-          format="%5.1f"                                                
-    />
-    <environmentTemperature description="temperature of the room in which the receiver is installed"
-          alarm_high_on="38.0"
-          alarm_high_off="36.0"
-          alarm_low_on="15.0"
-          alarm_low_off="17.0"
-          alarm_fault_family="BACIProperty"
-          alarm_fault_member="SRTLPBandReceiver"
-          default_value="33.0"
-          alarm_timer_trig="1.0"
-          alarm_level="0"
-          default_timer_trig="10"
-          min_timer_trig="1"
-          min_delta_trig="0.5"
-          units="Celsius degree"
-          format="%4.1f"                                    
-    />
-    <receiverStatus description="Overall status of the receiver"/>
-
-    <receiverName description="ReceiverName"/>
-
-</SRTLPBandReceiver>
diff --git a/SRT/Configuration/CDB/MACI/Components/BACKENDS/NoiseGenerator/NoiseGenerator.xml b/SRT/Configuration/CDB/MACI/Components/BACKENDS/NoiseGenerator/NoiseGenerator.xml
deleted file mode 100644
index 6f206ea78..000000000
--- a/SRT/Configuration/CDB/MACI/Components/BACKENDS/NoiseGenerator/NoiseGenerator.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-<!--
-   - History:
-   -   Wed Apr 13 15:18:03 UTC 2005 modified by Andrea Orlati
--->
-<NoiseGenerator xmlns="urn:schemas-cosylab-com:NoiseGenerator:1.0" 
-               xmlns:baci="urn:schemas-cosylab-com:BACI:1.0"
-               xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"
-               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-               sender_protocols="TCP=${HOST}:14000"
-               SenderSleepTime="300000"
-               SenderResponseTime="1000000" >
-	<time/>
-	<backendName/>
-	<bandWidth/>
-	<frequency/>
-	<sampleRate/>
-	<attenuation/>
-	<polarization/>
-	<bins/>
-	<feed/>
-	<systemTemperature/>
-	<inputSection/>
-	<inputsNumber/>
-	<sectionsNumber/>
-	<integration/>
-	<status/>
-	<busy/>
-</NoiseGenerator>
diff --git a/SRT/Configuration/CDB/alma/BACKENDS/NoiseGenerator/NoiseGenerator.xml b/SRT/Configuration/CDB/alma/BACKENDS/NoiseGenerator/NoiseGenerator.xml
deleted file mode 100644
index 6f206ea78..000000000
--- a/SRT/Configuration/CDB/alma/BACKENDS/NoiseGenerator/NoiseGenerator.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-<!--
-   - History:
-   -   Wed Apr 13 15:18:03 UTC 2005 modified by Andrea Orlati
--->
-<NoiseGenerator xmlns="urn:schemas-cosylab-com:NoiseGenerator:1.0" 
-               xmlns:baci="urn:schemas-cosylab-com:BACI:1.0"
-               xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"
-               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-               sender_protocols="TCP=${HOST}:14000"
-               SenderSleepTime="300000"
-               SenderResponseTime="1000000" >
-	<time/>
-	<backendName/>
-	<bandWidth/>
-	<frequency/>
-	<sampleRate/>
-	<attenuation/>
-	<polarization/>
-	<bins/>
-	<feed/>
-	<systemTemperature/>
-	<inputSection/>
-	<inputsNumber/>
-	<sectionsNumber/>
-	<integration/>
-	<status/>
-	<busy/>
-</NoiseGenerator>
diff --git a/SRT/Configuration/CDB/alma/DataBlock/SRTIFDistributor/Configuration/Configuration.xml b/SRT/Configuration/CDB/alma/DataBlock/SRTIFDistributor/Configuration/Configuration.xml
deleted file mode 100755
index 51fb4fa2c..000000000
--- a/SRT/Configuration/CDB/alma/DataBlock/SRTIFDistributor/Configuration/Configuration.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<SRTIFDistributorTable xmlns="urn:schemas-cosylab-com:SRTIFDistributorTable:1.0"
-             	xmlns:baci="urn:schemas-cosylab-com:BACI:1.0"
-				xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"
-				xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
-    <ConfigurationEntry>
-        <ConfigurationName>LO-DEFAULT</ConfigurationName>
-        <LO>
-            <Board>0</Board>
-            <Enable>1</Enable>
-            <Frequency>2300.0</Frequency>
-        </LO>
-    </ConfigurationEntry>
-    <ConfigurationEntry>
-        <ConfigurationName>BW-NARROW</ConfigurationName>
-        <BW>
-            <Board>1</Board>
-            <Bandwidth>0</Bandwidth>
-        </BW>
-        <BW>
-            <Board>2</Board>
-            <Bandwidth>0</Bandwidth>
-        </BW>
-    </ConfigurationEntry>
-    <ConfigurationEntry>
-        <ConfigurationName>BW-MEDIUM</ConfigurationName>
-        <BW>
-            <Board>1</Board>
-            <Bandwidth>1</Bandwidth>
-        </BW>
-        <BW>
-            <Board>2</Board>
-            <Bandwidth>1</Bandwidth>
-        </BW>
-    </ConfigurationEntry>
-    <ConfigurationEntry>
-        <ConfigurationName>BW-WIDE</ConfigurationName>
-        <BW>
-            <Board>1</Board>
-            <Bandwidth>2</Bandwidth>
-        </BW>
-        <BW>
-            <Board>2</Board>
-            <Bandwidth>2</Bandwidth>
-        </BW>
-    </ConfigurationEntry>
-    <ConfigurationEntry>
-        <ConfigurationName>BW-UNFILTERED</ConfigurationName>
-        <BW>
-            <Board>1</Board>
-            <Bandwidth>3</Bandwidth>
-        </BW>
-        <BW>
-            <Board>2</Board>
-            <Bandwidth>3</Bandwidth>
-        </BW>
-    </ConfigurationEntry>
-
-</SRTIFDistributorTable>
diff --git a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Feeds/Feeds.xml b/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Feeds/Feeds.xml
deleted file mode 100755
index 822569380..000000000
--- a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Feeds/Feeds.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<Feeds xmlns="urn:schemas-cosylab-com:Feeds:1.0"
-       xmlns:baci="urn:schemas-cosylab-com:BACI:1.0"
-       xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	
-	<Feed>
-		<feedCode>0</feedCode>
-		<xOffset>0.0</xOffset>
-		<yOffset>0.0</yOffset>
-		<relativePower>1.0</relativePower>
-	</Feed>
-	
-	<Feed>
-		<feedCode>1</feedCode>
-		<xOffset>0.0</xOffset>
-		<yOffset>0.0</yOffset>
-		<relativePower>1.0</relativePower>
-	</Feed>
-</Feeds>
diff --git a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C1C1/C1C1.xml b/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C1C1/C1C1.xml
deleted file mode 100755
index 84efd5a14..000000000
--- a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C1C1/C1C1.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<SRTLPBandReceiverModeSetup xmlns="urn:schemas-cosylab-com:SRTLPBandReceiverModeSetup:1.0"
-xmlns:baci="urn:schemas-cosylab-com:BACI:1.0"
-xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-
-Mode="C1C1"
-PBandRFMin="305.0 305.0"
-PBandRFMax="410.0 410.0"
-LBandRFMin="1300.0 1300.0"
-LBandRFMax="1800.0 1800.0"
-PBandFilterID="1"
-LBandFilterID="1"
-IFs="2"
-PBandIFMin="305.0 305.0"
-LBandIFMin="1300.0 1300.0"
-Feeds="2" 
-PBandPolarization="L R"
-LBandPolarization="L R"
-DefaultLO="2324.0 2324.0"
-FixedLO2="0.0 0.0"
-LOMin="0.0 0.0"
-LOMax="3000.0 3000.0"
-LowpassFilterMin="0.0 0.0"
-LowpassFilterMax="1000.0 1000.0"
-/>
-
diff --git a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C1C2/C1C2.xml b/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C1C2/C1C2.xml
deleted file mode 100755
index 486dbda00..000000000
--- a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C1C2/C1C2.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<SRTLPBandReceiverModeSetup xmlns="urn:schemas-cosylab-com:SRTLPBandReceiverModeSetup:1.0"
-xmlns:baci="urn:schemas-cosylab-com:BACI:1.0"
-xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-
-Mode="C1C2"
-PBandRFMin="305.0 305.0"
-PBandRFMax="410.0 410.0"
-LBandRFMin="1320.0 1320.0"
-LBandRFMax="1780.0 1780.0"
-PBandFilterID="1"
-LBandFilterID="2"
-IFs="2"
-PBandIFMin="305.0 305.0"
-LBandIFMin="1320.0 1320.0"
-Feeds="2" 
-PBandPolarization="L R"
-LBandPolarization="L R"
-DefaultLO="2324.0 2324.0"
-FixedLO2="0.0 0.0"
-LOMin="0.0 0.0"
-LOMax="3000.0 3000.0"
-LowpassFilterMin="0.0 0.0"
-LowpassFilterMax="1000.0 1000.0"
-/>
-
diff --git a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C1C3/C1C3.xml b/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C1C3/C1C3.xml
deleted file mode 100755
index 96c8bbfa3..000000000
--- a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C1C3/C1C3.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<SRTLPBandReceiverModeSetup xmlns="urn:schemas-cosylab-com:SRTLPBandReceiverModeSetup:1.0"
-xmlns:baci="urn:schemas-cosylab-com:BACI:1.0"
-xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-
-Mode="C1C3"
-PBandRFMin="305.0 305.0"
-PBandRFMax="410.0 410.0"
-LBandRFMin="1350.0 1350.0"
-LBandRFMax="1450.0 1450.0"
-PBandFilterID="1"
-LBandFilterID="3"
-IFs="2"
-PBandIFMin="305.0 305.0"
-LBandIFMin="1350.0 1350.0"
-Feeds="2" 
-PBandPolarization="L R"
-LBandPolarization="L R"
-DefaultLO="2324.0 2324.0"
-FixedLO2="0.0 0.0"
-LOMin="0.0 0.0"
-LOMax="3000.0 3000.0"
-LowpassFilterMin="0.0 0.0"
-LowpassFilterMax="1000.0 1000.0"
-/>
-
diff --git a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C1C4/C1C4.xml b/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C1C4/C1C4.xml
deleted file mode 100755
index 27538375d..000000000
--- a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C1C4/C1C4.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<SRTLPBandReceiverModeSetup xmlns="urn:schemas-cosylab-com:SRTLPBandReceiverModeSetup:1.0"
-xmlns:baci="urn:schemas-cosylab-com:BACI:1.0"
-xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-
-Mode="C1C4"
-PBandRFMin="305.0 305.0"
-PBandRFMax="410.0 410.0"
-LBandRFMin="1300.0 1300.0"
-LBandRFMax="1800.0 1800.0"
-PBandFilterID="1"
-LBandFilterID="4"
-IFs="2"
-PBandIFMin="305.0 305.0"
-LBandIFMin="1300.0 1300.0"
-Feeds="2" 
-PBandPolarization="L R"
-LBandPolarization="L R"
-DefaultLO="2324.0 2324.0"
-FixedLO2="0.0 0.0"
-LOMin="0.0 0.0"
-LOMax="3000.0 3000.0"
-LowpassFilterMin="0.0 0.0"
-LowpassFilterMax="1000.0 1000.0"
-/>
-
diff --git a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C1C5/C1C5.xml b/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C1C5/C1C5.xml
deleted file mode 100755
index 3c1fed631..000000000
--- a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C1C5/C1C5.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<SRTLPBandReceiverModeSetup xmlns="urn:schemas-cosylab-com:SRTLPBandReceiverModeSetup:1.0"
-xmlns:baci="urn:schemas-cosylab-com:BACI:1.0"
-xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-
-Mode="C1C5"
-PBandRFMin="305.0 305.0"
-PBandRFMax="410.0 410.0"
-LBandRFMin="1625.0 1625.0"
-LBandRFMax="1715.0 1715.0"
-PBandFilterID="1"
-LBandFilterID="5"
-IFs="2"
-PBandIFMin="305.0 305.0"
-LBandIFMin="1625.0 1625.0"
-Feeds="2" 
-PBandPolarization="L R"
-LBandPolarization="L R"
-DefaultLO="2324.0 2324.0"
-FixedLO2="0.0 0.0"
-LOMin="0.0 0.0"
-LOMax="3000.0 3000.0"
-LowpassFilterMin="0.0 0.0"
-LowpassFilterMax="1000.0 1000.0"
-/>
-
diff --git a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C1L1/C1L1.xml b/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C1L1/C1L1.xml
deleted file mode 100755
index ee724029f..000000000
--- a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C1L1/C1L1.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<SRTLPBandReceiverModeSetup xmlns="urn:schemas-cosylab-com:SRTLPBandReceiverModeSetup:1.0"
-xmlns:baci="urn:schemas-cosylab-com:BACI:1.0"
-xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-
-Mode="C1L1"
-PBandRFMin="305.0 305.0"
-PBandRFMax="410.0 410.0"
-LBandRFMin="1300.0 1300.0"
-LBandRFMax="1800.0 1800.0"
-PBandFilterID="1"
-LBandFilterID="1"
-IFs="2"
-PBandIFMin="305.0 305.0"
-LBandIFMin="1300.0 1300.0"
-Feeds="2" 
-PBandPolarization="L R"
-LBandPolarization="H V"
-DefaultLO="2324.0 2324.0"
-FixedLO2="0.0 0.0"
-LOMin="0.0 0.0"
-LOMax="3000.0 3000.0"
-LowpassFilterMin="0.0 0.0"
-LowpassFilterMax="1000.0 1000.0"
-/>
-
diff --git a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C1L2/C1L2.xml b/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C1L2/C1L2.xml
deleted file mode 100755
index ef198849a..000000000
--- a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C1L2/C1L2.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<SRTLPBandReceiverModeSetup xmlns="urn:schemas-cosylab-com:SRTLPBandReceiverModeSetup:1.0"
-xmlns:baci="urn:schemas-cosylab-com:BACI:1.0"
-xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-
-Mode="C1L2"
-PBandRFMin="305.0 305.0"
-PBandRFMax="410.0 410.0"
-LBandRFMin="1320.0 1320.0"
-LBandRFMax="1780.0 1780.0"
-PBandFilterID="1"
-LBandFilterID="2"
-IFs="2"
-PBandIFMin="305.0 305.0"
-LBandIFMin="1320.0 1320.0"
-Feeds="2" 
-PBandPolarization="L R"
-LBandPolarization="H V"
-DefaultLO="2324.0 2324.0"
-FixedLO2="0.0 0.0"
-LOMin="0.0 0.0"
-LOMax="3000.0 3000.0"
-LowpassFilterMin="0.0 0.0"
-LowpassFilterMax="1000.0 1000.0"
-/>
-
diff --git a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C1L3/C1L3.xml b/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C1L3/C1L3.xml
deleted file mode 100755
index 258a99af9..000000000
--- a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C1L3/C1L3.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<SRTLPBandReceiverModeSetup xmlns="urn:schemas-cosylab-com:SRTLPBandReceiverModeSetup:1.0"
-xmlns:baci="urn:schemas-cosylab-com:BACI:1.0"
-xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-
-Mode="C1L3"
-PBandRFMin="305.0 305.0"
-PBandRFMax="410.0 410.0"
-LBandRFMin="1350.0 1350.0"
-LBandRFMax="1450.0 1450.0"
-PBandFilterID="1"
-LBandFilterID="3"
-IFs="2"
-PBandIFMin="305.0 305.0"
-LBandIFMin="1350.0 1350.0"
-Feeds="2" 
-PBandPolarization="L R"
-LBandPolarization="H V"
-DefaultLO="2324.0 2324.0"
-FixedLO2="0.0 0.0"
-LOMin="0.0 0.0"
-LOMax="3000.0 3000.0"
-LowpassFilterMin="0.0 0.0"
-LowpassFilterMax="1000.0 1000.0"
-/>
-
diff --git a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C1L4/C1L4.xml b/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C1L4/C1L4.xml
deleted file mode 100755
index 2e9b081ca..000000000
--- a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C1L4/C1L4.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<SRTLPBandReceiverModeSetup xmlns="urn:schemas-cosylab-com:SRTLPBandReceiverModeSetup:1.0"
-xmlns:baci="urn:schemas-cosylab-com:BACI:1.0"
-xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-
-Mode="C1L4"
-PBandRFMin="305.0 305.0"
-PBandRFMax="410.0 410.0"
-LBandRFMin="1300.0 1300.0"
-LBandRFMax="1800.0 1800.0"
-PBandFilterID="1"
-LBandFilterID="4"
-IFs="2"
-PBandIFMin="305.0 305.0"
-LBandIFMin="1300.0 1300.0"
-Feeds="2" 
-PBandPolarization="L R"
-LBandPolarization="H V"
-DefaultLO="2324.0 2324.0"
-FixedLO2="0.0 0.0"
-LOMin="0.0 0.0"
-LOMax="3000.0 3000.0"
-LowpassFilterMin="0.0 0.0"
-LowpassFilterMax="1000.0 1000.0"
-/>
-
diff --git a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C1L5/C1L5.xml b/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C1L5/C1L5.xml
deleted file mode 100755
index e54d1e4bf..000000000
--- a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C1L5/C1L5.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<SRTLPBandReceiverModeSetup xmlns="urn:schemas-cosylab-com:SRTLPBandReceiverModeSetup:1.0"
-xmlns:baci="urn:schemas-cosylab-com:BACI:1.0"
-xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-
-Mode="C1L5"
-PBandRFMin="305.0 305.0"
-PBandRFMax="410.0 410.0"
-LBandRFMin="1625.0 1625.0"
-LBandRFMax="1715.0 1715.0"
-PBandFilterID="1"
-LBandFilterID="5"
-IFs="2"
-PBandIFMin="305.0 305.0"
-LBandIFMin="1625.0 1625.0"
-Feeds="2" 
-PBandPolarization="L R"
-LBandPolarization="H V"
-DefaultLO="2324.0 2324.0"
-FixedLO2="0.0 0.0"
-LOMin="0.0 0.0"
-LOMax="3000.0 3000.0"
-LowpassFilterMin="0.0 0.0"
-LowpassFilterMax="1000.0 1000.0"
-/>
-
diff --git a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C1XX/C1XX.xml b/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C1XX/C1XX.xml
deleted file mode 100755
index 7a99b4df4..000000000
--- a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C1XX/C1XX.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<SRTLPBandReceiverModeSetup xmlns="urn:schemas-cosylab-com:SRTLPBandReceiverModeSetup:1.0"
-xmlns:baci="urn:schemas-cosylab-com:BACI:1.0"
-xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-
-Mode="C1XX"
-PBandRFMin="305.0 305.0"
-PBandRFMax="410.0 410.0"
-LBandRFMin="1300.0 1300.0"
-LBandRFMax="1800.0 1800.0"
-PBandFilterID="1"
-LBandFilterID="1"
-IFs="2"
-PBandIFMin="305.0 305.0"
-LBandIFMin="1300.0 1300.0"
-Feeds="1" 
-LBandPolarization="L R"
-PBandPolarization="L R"
-DefaultLO="2324.0 2324.0"
-FixedLO2="0.0 0.0"
-LOMin="0.0 0.0"
-LOMax="3000.0 3000.0"
-LowpassFilterMin="0.0 0.0"
-LowpassFilterMax="1000.0 1000.0"
-/>
-
diff --git a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C2C1/C2C1.xml b/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C2C1/C2C1.xml
deleted file mode 100755
index 1176a6c82..000000000
--- a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C2C1/C2C1.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<SRTLPBandReceiverModeSetup xmlns="urn:schemas-cosylab-com:SRTLPBandReceiverModeSetup:1.0"
-xmlns:baci="urn:schemas-cosylab-com:BACI:1.0"
-xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-
-Mode="C2C1"
-PBandRFMin="310.0 310.0"
-PBandRFMax="350.0 350.0"
-LBandRFMin="1300.0 1300.0"
-LBandRFMax="1800.0 1800.0"
-PBandFilterID="2"
-LBandFilterID="1"
-IFs="2"
-PBandIFMin="310.0 310.0"
-LBandIFMin="1300.0 1300.0"
-Feeds="2" 
-PBandPolarization="L R"
-LBandPolarization="L R"
-DefaultLO="2324.0 2324.0"
-FixedLO2="0.0 0.0"
-LOMin="0.0 0.0"
-LOMax="3000.0 3000.0"
-LowpassFilterMin="0.0 0.0"
-LowpassFilterMax="1000.0 1000.0"
-/>
-
diff --git a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C2C2/C2C2.xml b/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C2C2/C2C2.xml
deleted file mode 100755
index 3b1864465..000000000
--- a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C2C2/C2C2.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<SRTLPBandReceiverModeSetup xmlns="urn:schemas-cosylab-com:SRTLPBandReceiverModeSetup:1.0"
-xmlns:baci="urn:schemas-cosylab-com:BACI:1.0"
-xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-
-Mode="C2C2"
-PBandRFMin="310.0 310.0"
-PBandRFMax="350.0 350.0"
-LBandRFMin="1320.0 1320.0"
-LBandRFMax="1780.0 1780.0"
-PBandFilterID="2"
-LBandFilterID="2"
-IFs="2"
-PBandIFMin="310.0 310.0"
-LBandIFMin="1320.0 1320.0"
-Feeds="2" 
-PBandPolarization="L R"
-LBandPolarization="L R"
-DefaultLO="2324.0 2324.0"
-FixedLO2="0.0 0.0"
-LOMin="0.0 0.0"
-LOMax="3000.0 3000.0"
-LowpassFilterMin="0.0 0.0"
-LowpassFilterMax="1000.0 1000.0"
-/>
-
diff --git a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C2C3/C2C3.xml b/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C2C3/C2C3.xml
deleted file mode 100755
index bf0b3bb04..000000000
--- a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C2C3/C2C3.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<SRTLPBandReceiverModeSetup xmlns="urn:schemas-cosylab-com:SRTLPBandReceiverModeSetup:1.0"
-xmlns:baci="urn:schemas-cosylab-com:BACI:1.0"
-xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-
-Mode="C2C3"
-PBandRFMin="310.0 310.0"
-PBandRFMax="350.0 350.0"
-LBandRFMin="1350.0 1350.0"
-LBandRFMax="1450.0 1450.0"
-PBandFilterID="2"
-LBandFilterID="3"
-IFs="2"
-PBandIFMin="310.0 310.0"
-LBandIFMin="1350.0 1350.0"
-Feeds="2" 
-PBandPolarization="L R"
-LBandPolarization="L R"
-DefaultLO="2324.0 2324.0"
-FixedLO2="0.0 0.0"
-LOMin="0.0 0.0"
-LOMax="3000.0 3000.0"
-LowpassFilterMin="0.0 0.0"
-LowpassFilterMax="1000.0 1000.0"
-/>
-
diff --git a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C2C4/C2C4.xml b/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C2C4/C2C4.xml
deleted file mode 100755
index 11821495d..000000000
--- a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C2C4/C2C4.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<SRTLPBandReceiverModeSetup xmlns="urn:schemas-cosylab-com:SRTLPBandReceiverModeSetup:1.0"
-xmlns:baci="urn:schemas-cosylab-com:BACI:1.0"
-xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-
-Mode="C2C4"
-PBandRFMin="310.0 310.0"
-PBandRFMax="350.0 350.0"
-LBandRFMin="1300.0 1300.0"
-LBandRFMax="1800.0 1800.0"
-PBandFilterID="2"
-LBandFilterID="4"
-IFs="2"
-PBandIFMin="310.0 310.0"
-LBandIFMin="1300.0 1300.0"
-Feeds="2" 
-PBandPolarization="L R"
-LBandPolarization="L R"
-DefaultLO="2324.0 2324.0"
-FixedLO2="0.0 0.0"
-LOMin="0.0 0.0"
-LOMax="3000.0 3000.0"
-LowpassFilterMin="0.0 0.0"
-LowpassFilterMax="1000.0 1000.0"
-/>
-
diff --git a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C2C5/C2C5.xml b/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C2C5/C2C5.xml
deleted file mode 100755
index 5bfd21a59..000000000
--- a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C2C5/C2C5.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<SRTLPBandReceiverModeSetup xmlns="urn:schemas-cosylab-com:SRTLPBandReceiverModeSetup:1.0"
-xmlns:baci="urn:schemas-cosylab-com:BACI:1.0"
-xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-
-Mode="C2C5"
-PBandRFMin="310.0 310.0"
-PBandRFMax="350.0 350.0"
-LBandRFMin="1625.0 1625.0"
-LBandRFMax="1715.0 1715.0"
-PBandFilterID="2"
-LBandFilterID="5"
-IFs="2"
-PBandIFMin="310.0 310.0"
-LBandIFMin="1625.0 1625.0"
-Feeds="2" 
-PBandPolarization="L R"
-LBandPolarization="L R"
-DefaultLO="2324.0 2324.0"
-FixedLO2="0.0 0.0"
-LOMin="0.0 0.0"
-LOMax="3000.0 3000.0"
-LowpassFilterMin="0.0 0.0"
-LowpassFilterMax="1000.0 1000.0"
-/>
-
diff --git a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C2L1/C2L1.xml b/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C2L1/C2L1.xml
deleted file mode 100755
index 5cd5f7c22..000000000
--- a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C2L1/C2L1.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<SRTLPBandReceiverModeSetup xmlns="urn:schemas-cosylab-com:SRTLPBandReceiverModeSetup:1.0"
-xmlns:baci="urn:schemas-cosylab-com:BACI:1.0"
-xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-
-Mode="C2L1"
-PBandRFMin="310.0 310.0"
-PBandRFMax="350.0 350.0"
-LBandRFMin="1300.0 1300.0"
-LBandRFMax="1800.0 1800.0"
-PBandFilterID="2"
-LBandFilterID="1"
-IFs="2"
-PBandIFMin="310.0 310.0"
-LBandIFMin="1300.0 1300.0"
-Feeds="2" 
-PBandPolarization="L R"
-LBandPolarization="H V"
-DefaultLO="2324.0 2324.0"
-FixedLO2="0.0 0.0"
-LOMin="0.0 0.0"
-LOMax="3000.0 3000.0"
-LowpassFilterMin="0.0 0.0"
-LowpassFilterMax="1000.0 1000.0"
-/>
-
diff --git a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C2L2/C2L2.xml b/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C2L2/C2L2.xml
deleted file mode 100755
index e5644e90c..000000000
--- a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C2L2/C2L2.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<SRTLPBandReceiverModeSetup xmlns="urn:schemas-cosylab-com:SRTLPBandReceiverModeSetup:1.0"
-xmlns:baci="urn:schemas-cosylab-com:BACI:1.0"
-xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-
-Mode="C2L2"
-PBandRFMin="310.0 310.0"
-PBandRFMax="350.0 350.0"
-LBandRFMin="1320.0 1320.0"
-LBandRFMax="1780.0 1780.0"
-PBandFilterID="2"
-LBandFilterID="2"
-IFs="2"
-PBandIFMin="310.0 310.0"
-LBandIFMin="1320.0 1320.0"
-Feeds="2" 
-PBandPolarization="L R"
-LBandPolarization="H V"
-DefaultLO="2324.0 2324.0"
-FixedLO2="0.0 0.0"
-LOMin="0.0 0.0"
-LOMax="3000.0 3000.0"
-LowpassFilterMin="0.0 0.0"
-LowpassFilterMax="1000.0 1000.0"
-/>
-
diff --git a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C2L3/C2L3.xml b/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C2L3/C2L3.xml
deleted file mode 100755
index 193a868d7..000000000
--- a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C2L3/C2L3.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<SRTLPBandReceiverModeSetup xmlns="urn:schemas-cosylab-com:SRTLPBandReceiverModeSetup:1.0"
-xmlns:baci="urn:schemas-cosylab-com:BACI:1.0"
-xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-
-Mode="C2L3"
-PBandRFMin="310.0 310.0"
-PBandRFMax="350.0 350.0"
-LBandRFMin="1350.0 1350.0"
-LBandRFMax="1450.0 1450.0"
-PBandFilterID="2"
-LBandFilterID="3"
-IFs="2"
-PBandIFMin="310.0 310.0"
-LBandIFMin="1350.0 1350.0"
-Feeds="2" 
-PBandPolarization="L R"
-LBandPolarization="H V"
-DefaultLO="2324.0 2324.0"
-FixedLO2="0.0 0.0"
-LOMin="0.0 0.0"
-LOMax="3000.0 3000.0"
-LowpassFilterMin="0.0 0.0"
-LowpassFilterMax="1000.0 1000.0"
-/>
-
diff --git a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C2L4/C2L4.xml b/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C2L4/C2L4.xml
deleted file mode 100755
index 926adb8fd..000000000
--- a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C2L4/C2L4.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<SRTLPBandReceiverModeSetup xmlns="urn:schemas-cosylab-com:SRTLPBandReceiverModeSetup:1.0"
-xmlns:baci="urn:schemas-cosylab-com:BACI:1.0"
-xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-
-Mode="C2L4"
-PBandRFMin="310.0 310.0"
-PBandRFMax="350.0 350.0"
-LBandRFMin="1300.0 1300.0"
-LBandRFMax="1800.0 1800.0"
-PBandFilterID="2"
-LBandFilterID="4"
-IFs="2"
-PBandIFMin="310.0 310.0"
-LBandIFMin="1300.0 1300.0"
-Feeds="2" 
-PBandPolarization="L R"
-LBandPolarization="H V"
-DefaultLO="2324.0 2324.0"
-FixedLO2="0.0 0.0"
-LOMin="0.0 0.0"
-LOMax="3000.0 3000.0"
-LowpassFilterMin="0.0 0.0"
-LowpassFilterMax="1000.0 1000.0"
-/>
-
diff --git a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C2L5/C2L5.xml b/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C2L5/C2L5.xml
deleted file mode 100755
index 0095de270..000000000
--- a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C2L5/C2L5.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<SRTLPBandReceiverModeSetup xmlns="urn:schemas-cosylab-com:SRTLPBandReceiverModeSetup:1.0"
-xmlns:baci="urn:schemas-cosylab-com:BACI:1.0"
-xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-
-Mode="C2L5"
-PBandRFMin="310.0 310.0"
-PBandRFMax="350.0 350.0"
-LBandRFMin="1625.0 1625.0"
-LBandRFMax="1715.0 1715.0"
-PBandFilterID="2"
-LBandFilterID="5"
-IFs="2"
-PBandIFMin="310.0 310.0"
-LBandIFMin="1625.0 1625.0"
-Feeds="2" 
-PBandPolarization="L R"
-LBandPolarization="H V"
-DefaultLO="2324.0 2324.0"
-FixedLO2="0.0 0.0"
-LOMin="0.0 0.0"
-LOMax="3000.0 3000.0"
-LowpassFilterMin="0.0 0.0"
-LowpassFilterMax="1000.0 1000.0"
-/>
-
diff --git a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C2XX/C2XX.xml b/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C2XX/C2XX.xml
deleted file mode 100755
index bbf5eef3f..000000000
--- a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C2XX/C2XX.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<SRTLPBandReceiverModeSetup xmlns="urn:schemas-cosylab-com:SRTLPBandReceiverModeSetup:1.0"
-xmlns:baci="urn:schemas-cosylab-com:BACI:1.0"
-xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-
-Mode="C2XX"
-PBandRFMin="310.0 310.0"
-PBandRFMax="350.0 350.0"
-LBandRFMin="1300.0 1300.0"
-LBandRFMax="1800.0 1800.0"
-PBandFilterID="2"
-LBandFilterID="1"
-IFs="2"
-PBandIFMin="310.0 310.0"
-LBandIFMin="1300.0 1300.0"
-Feeds="1" 
-LBandPolarization="L R"
-PBandPolarization="L R"
-DefaultLO="2324.0 2324.0"
-FixedLO2="0.0 0.0"
-LOMin="0.0 0.0"
-LOMax="3000.0 3000.0"
-LowpassFilterMin="0.0 0.0"
-LowpassFilterMax="1000.0 1000.0"
-/>
-
diff --git a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C3C1/C3C1.xml b/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C3C1/C3C1.xml
deleted file mode 100755
index aa0ed2acd..000000000
--- a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C3C1/C3C1.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<SRTLPBandReceiverModeSetup xmlns="urn:schemas-cosylab-com:SRTLPBandReceiverModeSetup:1.0"
-xmlns:baci="urn:schemas-cosylab-com:BACI:1.0"
-xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-
-Mode="C3C1"
-PBandRFMin="305.0 305.0"
-PBandRFMax="410.0 410.0"
-LBandRFMin="1300.0 1300.0"
-LBandRFMax="1800.0 1800.0"
-PBandFilterID="3"
-LBandFilterID="1"
-IFs="2"
-PBandIFMin="305.0 305.0"
-LBandIFMin="1300.0 1300.0"
-Feeds="2" 
-PBandPolarization="L R"
-LBandPolarization="L R"
-DefaultLO="2324.0 2324.0"
-FixedLO2="0.0 0.0"
-LOMin="0.0 0.0"
-LOMax="3000.0 3000.0"
-LowpassFilterMin="0.0 0.0"
-LowpassFilterMax="1000.0 1000.0"
-/>
-
diff --git a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C3C2/C3C2.xml b/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C3C2/C3C2.xml
deleted file mode 100755
index b0cf43e30..000000000
--- a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C3C2/C3C2.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<SRTLPBandReceiverModeSetup xmlns="urn:schemas-cosylab-com:SRTLPBandReceiverModeSetup:1.0"
-xmlns:baci="urn:schemas-cosylab-com:BACI:1.0"
-xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-
-Mode="C3C2"
-PBandRFMin="305.0 305.0"
-PBandRFMax="410.0 410.0"
-LBandRFMin="1320.0 1320.0"
-LBandRFMax="1780.0 1780.0"
-PBandFilterID="3"
-LBandFilterID="2"
-IFs="2"
-PBandIFMin="305.0 305.0"
-LBandIFMin="1320.0 1320.0"
-Feeds="2" 
-PBandPolarization="L R"
-LBandPolarization="L R"
-DefaultLO="2324.0 2324.0"
-FixedLO2="0.0 0.0"
-LOMin="0.0 0.0"
-LOMax="3000.0 3000.0"
-LowpassFilterMin="0.0 0.0"
-LowpassFilterMax="1000.0 1000.0"
-/>
-
diff --git a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C3C3/C3C3.xml b/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C3C3/C3C3.xml
deleted file mode 100755
index b759bdc87..000000000
--- a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C3C3/C3C3.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<SRTLPBandReceiverModeSetup xmlns="urn:schemas-cosylab-com:SRTLPBandReceiverModeSetup:1.0"
-xmlns:baci="urn:schemas-cosylab-com:BACI:1.0"
-xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-
-Mode="C3C3"
-PBandRFMin="305.0 305.0"
-PBandRFMax="410.0 410.0"
-LBandRFMin="1350.0 1350.0"
-LBandRFMax="1450.0 1450.0"
-PBandFilterID="3"
-LBandFilterID="3"
-IFs="2"
-PBandIFMin="305.0 305.0"
-LBandIFMin="1350.0 1350.0"
-Feeds="2" 
-PBandPolarization="L R"
-LBandPolarization="L R"
-DefaultLO="2324.0 2324.0"
-FixedLO2="0.0 0.0"
-LOMin="0.0 0.0"
-LOMax="3000.0 3000.0"
-LowpassFilterMin="0.0 0.0"
-LowpassFilterMax="1000.0 1000.0"
-/>
-
diff --git a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C3C4/C3C4.xml b/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C3C4/C3C4.xml
deleted file mode 100755
index d6f9a64f2..000000000
--- a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C3C4/C3C4.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<SRTLPBandReceiverModeSetup xmlns="urn:schemas-cosylab-com:SRTLPBandReceiverModeSetup:1.0"
-xmlns:baci="urn:schemas-cosylab-com:BACI:1.0"
-xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-
-Mode="C3C4"
-PBandRFMin="305.0 305.0"
-PBandRFMax="410.0 410.0"
-LBandRFMin="1300.0 1300.0"
-LBandRFMax="1800.0 1800.0"
-PBandFilterID="3"
-LBandFilterID="4"
-IFs="2"
-PBandIFMin="305.0 305.0"
-LBandIFMin="1300.0 1300.0"
-Feeds="2" 
-PBandPolarization="L R"
-LBandPolarization="L R"
-DefaultLO="2324.0 2324.0"
-FixedLO2="0.0 0.0"
-LOMin="0.0 0.0"
-LOMax="3000.0 3000.0"
-LowpassFilterMin="0.0 0.0"
-LowpassFilterMax="1000.0 1000.0"
-/>
-
diff --git a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C3C5/C3C5.xml b/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C3C5/C3C5.xml
deleted file mode 100755
index 6d2ff7b6d..000000000
--- a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C3C5/C3C5.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<SRTLPBandReceiverModeSetup xmlns="urn:schemas-cosylab-com:SRTLPBandReceiverModeSetup:1.0"
-xmlns:baci="urn:schemas-cosylab-com:BACI:1.0"
-xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-
-Mode="C3C5"
-PBandRFMin="305.0 305.0"
-PBandRFMax="410.0 410.0"
-LBandRFMin="1625.0 1625.0"
-LBandRFMax="1715.0 1715.0"
-PBandFilterID="3"
-LBandFilterID="5"
-IFs="2"
-PBandIFMin="305.0 305.0"
-LBandIFMin="1625.0 1625.0"
-Feeds="2" 
-PBandPolarization="L R"
-LBandPolarization="L R"
-DefaultLO="2324.0 2324.0"
-FixedLO2="0.0 0.0"
-LOMin="0.0 0.0"
-LOMax="3000.0 3000.0"
-LowpassFilterMin="0.0 0.0"
-LowpassFilterMax="1000.0 1000.0"
-/>
-
diff --git a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C3L1/C3L1.xml b/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C3L1/C3L1.xml
deleted file mode 100755
index 92d133b12..000000000
--- a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C3L1/C3L1.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<SRTLPBandReceiverModeSetup xmlns="urn:schemas-cosylab-com:SRTLPBandReceiverModeSetup:1.0"
-xmlns:baci="urn:schemas-cosylab-com:BACI:1.0"
-xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-
-Mode="C3L1"
-PBandRFMin="305.0 305.0"
-PBandRFMax="410.0 410.0"
-LBandRFMin="1300.0 1300.0"
-LBandRFMax="1800.0 1800.0"
-PBandFilterID="3"
-LBandFilterID="1"
-IFs="2"
-PBandIFMin="305.0 305.0"
-LBandIFMin="1300.0 1300.0"
-Feeds="2" 
-PBandPolarization="L R"
-LBandPolarization="H V"
-DefaultLO="2324.0 2324.0"
-FixedLO2="0.0 0.0"
-LOMin="0.0 0.0"
-LOMax="3000.0 3000.0"
-LowpassFilterMin="0.0 0.0"
-LowpassFilterMax="1000.0 1000.0"
-/>
-
diff --git a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C3L2/C3L2.xml b/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C3L2/C3L2.xml
deleted file mode 100755
index efc49c516..000000000
--- a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C3L2/C3L2.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<SRTLPBandReceiverModeSetup xmlns="urn:schemas-cosylab-com:SRTLPBandReceiverModeSetup:1.0"
-xmlns:baci="urn:schemas-cosylab-com:BACI:1.0"
-xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-
-Mode="C3L2"
-PBandRFMin="305.0 305.0"
-PBandRFMax="410.0 410.0"
-LBandRFMin="1320.0 1320.0"
-LBandRFMax="1780.0 1780.0"
-PBandFilterID="3"
-LBandFilterID="2"
-IFs="2"
-PBandIFMin="305.0 305.0"
-LBandIFMin="1320.0 1320.0"
-Feeds="2" 
-PBandPolarization="L R"
-LBandPolarization="H V"
-DefaultLO="2324.0 2324.0"
-FixedLO2="0.0 0.0"
-LOMin="0.0 0.0"
-LOMax="3000.0 3000.0"
-LowpassFilterMin="0.0 0.0"
-LowpassFilterMax="1000.0 1000.0"
-/>
-
diff --git a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C3L3/C3L3.xml b/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C3L3/C3L3.xml
deleted file mode 100755
index 80d52142e..000000000
--- a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C3L3/C3L3.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<SRTLPBandReceiverModeSetup xmlns="urn:schemas-cosylab-com:SRTLPBandReceiverModeSetup:1.0"
-xmlns:baci="urn:schemas-cosylab-com:BACI:1.0"
-xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-
-Mode="C3L3"
-PBandRFMin="305.0 305.0"
-PBandRFMax="410.0 410.0"
-LBandRFMin="1350.0 1350.0"
-LBandRFMax="1450.0 1450.0"
-PBandFilterID="3"
-LBandFilterID="3"
-IFs="2"
-PBandIFMin="305.0 305.0"
-LBandIFMin="1350.0 1350.0"
-Feeds="2" 
-PBandPolarization="L R"
-LBandPolarization="H V"
-DefaultLO="2324.0 2324.0"
-FixedLO2="0.0 0.0"
-LOMin="0.0 0.0"
-LOMax="3000.0 3000.0"
-LowpassFilterMin="0.0 0.0"
-LowpassFilterMax="1000.0 1000.0"
-/>
-
diff --git a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C3L4/C3L4.xml b/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C3L4/C3L4.xml
deleted file mode 100755
index ad7c48bd4..000000000
--- a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C3L4/C3L4.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<SRTLPBandReceiverModeSetup xmlns="urn:schemas-cosylab-com:SRTLPBandReceiverModeSetup:1.0"
-xmlns:baci="urn:schemas-cosylab-com:BACI:1.0"
-xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-
-Mode="C3L4"
-PBandRFMin="305.0 305.0"
-PBandRFMax="410.0 410.0"
-LBandRFMin="1300.0 1300.0"
-LBandRFMax="1800.0 1800.0"
-PBandFilterID="3"
-LBandFilterID="4"
-IFs="2"
-PBandIFMin="305.0 305.0"
-LBandIFMin="1300.0 1300.0"
-Feeds="2" 
-PBandPolarization="L R"
-LBandPolarization="H V"
-DefaultLO="2324.0 2324.0"
-FixedLO2="0.0 0.0"
-LOMin="0.0 0.0"
-LOMax="3000.0 3000.0"
-LowpassFilterMin="0.0 0.0"
-LowpassFilterMax="1000.0 1000.0"
-/>
-
diff --git a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C3L5/C3L5.xml b/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C3L5/C3L5.xml
deleted file mode 100755
index 3efc4df4c..000000000
--- a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C3L5/C3L5.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<SRTLPBandReceiverModeSetup xmlns="urn:schemas-cosylab-com:SRTLPBandReceiverModeSetup:1.0"
-xmlns:baci="urn:schemas-cosylab-com:BACI:1.0"
-xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-
-Mode="C3L5"
-PBandRFMin="305.0 305.0"
-PBandRFMax="410.0 410.0"
-LBandRFMin="1625.0 1625.0"
-LBandRFMax="1715.0 1715.0"
-PBandFilterID="3"
-LBandFilterID="5"
-IFs="2"
-PBandIFMin="305.0 305.0"
-LBandIFMin="1625.0 1625.0"
-Feeds="2" 
-PBandPolarization="L R"
-LBandPolarization="H V"
-DefaultLO="2324.0 2324.0"
-FixedLO2="0.0 0.0"
-LOMin="0.0 0.0"
-LOMax="3000.0 3000.0"
-LowpassFilterMin="0.0 0.0"
-LowpassFilterMax="1000.0 1000.0"
-/>
-
diff --git a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C3XX/C3XX.xml b/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C3XX/C3XX.xml
deleted file mode 100755
index bcb5bc99d..000000000
--- a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C3XX/C3XX.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<SRTLPBandReceiverModeSetup xmlns="urn:schemas-cosylab-com:SRTLPBandReceiverModeSetup:1.0"
-xmlns:baci="urn:schemas-cosylab-com:BACI:1.0"
-xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-
-Mode="C3XX"
-PBandRFMin="305.0 305.0"
-PBandRFMax="410.0 410.0"
-LBandRFMin="1300.0 1300.0"
-LBandRFMax="1800.0 1800.0"
-PBandFilterID="3"
-LBandFilterID="1"
-IFs="2"
-PBandIFMin="305.0 305.0"
-LBandIFMin="1300.0 1300.0"
-Feeds="1" 
-LBandPolarization="L R"
-PBandPolarization="L R"
-DefaultLO="2324.0 2324.0"
-FixedLO2="0.0 0.0"
-LOMin="0.0 0.0"
-LOMax="3000.0 3000.0"
-LowpassFilterMin="0.0 0.0"
-LowpassFilterMax="1000.0 1000.0"
-/>
-
diff --git a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L1C1/L1C1.xml b/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L1C1/L1C1.xml
deleted file mode 100755
index ba4961e9e..000000000
--- a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L1C1/L1C1.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<SRTLPBandReceiverModeSetup xmlns="urn:schemas-cosylab-com:SRTLPBandReceiverModeSetup:1.0"
-xmlns:baci="urn:schemas-cosylab-com:BACI:1.0"
-xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-
-Mode="L1C1"
-PBandRFMin="305.0 305.0"
-PBandRFMax="410.0 410.0"
-LBandRFMin="1300.0 1300.0"
-LBandRFMax="1800.0 1800.0"
-PBandFilterID="1"
-LBandFilterID="1"
-IFs="2"
-PBandIFMin="305.0 305.0"
-LBandIFMin="1300.0 1300.0"
-Feeds="2" 
-PBandPolarization="H V"
-LBandPolarization="L R"
-DefaultLO="2324.0 2324.0"
-FixedLO2="0.0 0.0"
-LOMin="0.0 0.0"
-LOMax="3000.0 3000.0"
-LowpassFilterMin="0.0 0.0"
-LowpassFilterMax="1000.0 1000.0"
-/>
-
diff --git a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L1C2/L1C2.xml b/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L1C2/L1C2.xml
deleted file mode 100755
index 99547746c..000000000
--- a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L1C2/L1C2.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<SRTLPBandReceiverModeSetup xmlns="urn:schemas-cosylab-com:SRTLPBandReceiverModeSetup:1.0"
-xmlns:baci="urn:schemas-cosylab-com:BACI:1.0"
-xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-
-Mode="L1C2"
-PBandRFMin="305.0 305.0"
-PBandRFMax="410.0 410.0"
-LBandRFMin="1320.0 1320.0"
-LBandRFMax="1780.0 1780.0"
-PBandFilterID="1"
-LBandFilterID="2"
-IFs="2"
-PBandIFMin="305.0 305.0"
-LBandIFMin="1320.0 1320.0"
-Feeds="2" 
-PBandPolarization="H V"
-LBandPolarization="L R"
-DefaultLO="2324.0 2324.0"
-FixedLO2="0.0 0.0"
-LOMin="0.0 0.0"
-LOMax="3000.0 3000.0"
-LowpassFilterMin="0.0 0.0"
-LowpassFilterMax="1000.0 1000.0"
-/>
-
diff --git a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L1C3/L1C3.xml b/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L1C3/L1C3.xml
deleted file mode 100755
index e0a0dae8a..000000000
--- a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L1C3/L1C3.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<SRTLPBandReceiverModeSetup xmlns="urn:schemas-cosylab-com:SRTLPBandReceiverModeSetup:1.0"
-xmlns:baci="urn:schemas-cosylab-com:BACI:1.0"
-xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-
-Mode="L1C3"
-PBandRFMin="305.0 305.0"
-PBandRFMax="410.0 410.0"
-LBandRFMin="1350.0 1350.0"
-LBandRFMax="1450.0 1450.0"
-PBandFilterID="1"
-LBandFilterID="3"
-IFs="2"
-PBandIFMin="305.0 305.0"
-LBandIFMin="1350.0 1350.0"
-Feeds="2" 
-PBandPolarization="H V"
-LBandPolarization="L R"
-DefaultLO="2324.0 2324.0"
-FixedLO2="0.0 0.0"
-LOMin="0.0 0.0"
-LOMax="3000.0 3000.0"
-LowpassFilterMin="0.0 0.0"
-LowpassFilterMax="1000.0 1000.0"
-/>
-
diff --git a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L1C4/L1C4.xml b/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L1C4/L1C4.xml
deleted file mode 100755
index 4e7aeea44..000000000
--- a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L1C4/L1C4.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<SRTLPBandReceiverModeSetup xmlns="urn:schemas-cosylab-com:SRTLPBandReceiverModeSetup:1.0"
-xmlns:baci="urn:schemas-cosylab-com:BACI:1.0"
-xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-
-Mode="L1C4"
-PBandRFMin="305.0 305.0"
-PBandRFMax="410.0 410.0"
-LBandRFMin="1300.0 1300.0"
-LBandRFMax="1800.0 1800.0"
-PBandFilterID="1"
-LBandFilterID="4"
-IFs="2"
-PBandIFMin="305.0 305.0"
-LBandIFMin="1300.0 1300.0"
-Feeds="2" 
-PBandPolarization="H V"
-LBandPolarization="L R"
-DefaultLO="2324.0 2324.0"
-FixedLO2="0.0 0.0"
-LOMin="0.0 0.0"
-LOMax="3000.0 3000.0"
-LowpassFilterMin="0.0 0.0"
-LowpassFilterMax="1000.0 1000.0"
-/>
-
diff --git a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L1C5/L1C5.xml b/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L1C5/L1C5.xml
deleted file mode 100755
index 9319a10bf..000000000
--- a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L1C5/L1C5.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<SRTLPBandReceiverModeSetup xmlns="urn:schemas-cosylab-com:SRTLPBandReceiverModeSetup:1.0"
-xmlns:baci="urn:schemas-cosylab-com:BACI:1.0"
-xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-
-Mode="L1C5"
-PBandRFMin="305.0 305.0"
-PBandRFMax="410.0 410.0"
-LBandRFMin="1625.0 1625.0"
-LBandRFMax="1715.0 1715.0"
-PBandFilterID="1"
-LBandFilterID="5"
-IFs="2"
-PBandIFMin="305.0 305.0"
-LBandIFMin="1625.0 1625.0"
-Feeds="2" 
-PBandPolarization="H V"
-LBandPolarization="L R"
-DefaultLO="2324.0 2324.0"
-FixedLO2="0.0 0.0"
-LOMin="0.0 0.0"
-LOMax="3000.0 3000.0"
-LowpassFilterMin="0.0 0.0"
-LowpassFilterMax="1000.0 1000.0"
-/>
-
diff --git a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L1L1/L1L1.xml b/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L1L1/L1L1.xml
deleted file mode 100755
index 725282b04..000000000
--- a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L1L1/L1L1.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<SRTLPBandReceiverModeSetup xmlns="urn:schemas-cosylab-com:SRTLPBandReceiverModeSetup:1.0"
-xmlns:baci="urn:schemas-cosylab-com:BACI:1.0"
-xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-
-Mode="L1L1"
-PBandRFMin="305.0 305.0"
-PBandRFMax="410.0 410.0"
-LBandRFMin="1300.0 1300.0"
-LBandRFMax="1800.0 1800.0"
-PBandFilterID="1"
-LBandFilterID="1"
-IFs="2"
-PBandIFMin="305.0 305.0"
-LBandIFMin="1300.0 1300.0"
-Feeds="2" 
-PBandPolarization="H V"
-LBandPolarization="H V"
-DefaultLO="2324.0 2324.0"
-FixedLO2="0.0 0.0"
-LOMin="0.0 0.0"
-LOMax="3000.0 3000.0"
-LowpassFilterMin="0.0 0.0"
-LowpassFilterMax="1000.0 1000.0"
-/>
-
diff --git a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L1L2/L1L2.xml b/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L1L2/L1L2.xml
deleted file mode 100755
index 1d22139d7..000000000
--- a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L1L2/L1L2.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<SRTLPBandReceiverModeSetup xmlns="urn:schemas-cosylab-com:SRTLPBandReceiverModeSetup:1.0"
-xmlns:baci="urn:schemas-cosylab-com:BACI:1.0"
-xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-
-Mode="L1L2"
-PBandRFMin="305.0 305.0"
-PBandRFMax="410.0 410.0"
-LBandRFMin="1320.0 1320.0"
-LBandRFMax="1780.0 1780.0"
-PBandFilterID="1"
-LBandFilterID="2"
-IFs="2"
-PBandIFMin="305.0 305.0"
-LBandIFMin="1320.0 1320.0"
-Feeds="2" 
-PBandPolarization="H V"
-LBandPolarization="H V"
-DefaultLO="2324.0 2324.0"
-FixedLO2="0.0 0.0"
-LOMin="0.0 0.0"
-LOMax="3000.0 3000.0"
-LowpassFilterMin="0.0 0.0"
-LowpassFilterMax="1000.0 1000.0"
-/>
-
diff --git a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L1L3/L1L3.xml b/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L1L3/L1L3.xml
deleted file mode 100755
index 8509452ae..000000000
--- a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L1L3/L1L3.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<SRTLPBandReceiverModeSetup xmlns="urn:schemas-cosylab-com:SRTLPBandReceiverModeSetup:1.0"
-xmlns:baci="urn:schemas-cosylab-com:BACI:1.0"
-xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-
-Mode="L1L3"
-PBandRFMin="305.0 305.0"
-PBandRFMax="410.0 410.0"
-LBandRFMin="1350.0 1350.0"
-LBandRFMax="1450.0 1450.0"
-PBandFilterID="1"
-LBandFilterID="3"
-IFs="2"
-PBandIFMin="305.0 305.0"
-LBandIFMin="1350.0 1350.0"
-Feeds="2" 
-PBandPolarization="H V"
-LBandPolarization="H V"
-DefaultLO="2324.0 2324.0"
-FixedLO2="0.0 0.0"
-LOMin="0.0 0.0"
-LOMax="3000.0 3000.0"
-LowpassFilterMin="0.0 0.0"
-LowpassFilterMax="1000.0 1000.0"
-/>
-
diff --git a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L1L4/L1L4.xml b/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L1L4/L1L4.xml
deleted file mode 100755
index 0ea4504a9..000000000
--- a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L1L4/L1L4.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<SRTLPBandReceiverModeSetup xmlns="urn:schemas-cosylab-com:SRTLPBandReceiverModeSetup:1.0"
-xmlns:baci="urn:schemas-cosylab-com:BACI:1.0"
-xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-
-Mode="L1L4"
-PBandRFMin="305.0 305.0"
-PBandRFMax="410.0 410.0"
-LBandRFMin="1300.0 1300.0"
-LBandRFMax="1800.0 1800.0"
-PBandFilterID="1"
-LBandFilterID="4"
-IFs="2"
-PBandIFMin="305.0 305.0"
-LBandIFMin="1300.0 1300.0"
-Feeds="2" 
-PBandPolarization="H V"
-LBandPolarization="H V"
-DefaultLO="2324.0 2324.0"
-FixedLO2="0.0 0.0"
-LOMin="0.0 0.0"
-LOMax="3000.0 3000.0"
-LowpassFilterMin="0.0 0.0"
-LowpassFilterMax="1000.0 1000.0"
-/>
-
diff --git a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L1L5/L1L5.xml b/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L1L5/L1L5.xml
deleted file mode 100755
index ca18f637b..000000000
--- a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L1L5/L1L5.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<SRTLPBandReceiverModeSetup xmlns="urn:schemas-cosylab-com:SRTLPBandReceiverModeSetup:1.0"
-xmlns:baci="urn:schemas-cosylab-com:BACI:1.0"
-xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-
-Mode="L1L5"
-PBandRFMin="305.0 305.0"
-PBandRFMax="410.0 410.0"
-LBandRFMin="1625.0 1625.0"
-LBandRFMax="1715.0 1715.0"
-PBandFilterID="1"
-LBandFilterID="5"
-IFs="2"
-PBandIFMin="305.0 305.0"
-LBandIFMin="1625.0 1625.0"
-Feeds="2" 
-PBandPolarization="H V"
-LBandPolarization="H V"
-DefaultLO="2324.0 2324.0"
-FixedLO2="0.0 0.0"
-LOMin="0.0 0.0"
-LOMax="3000.0 3000.0"
-LowpassFilterMin="0.0 0.0"
-LowpassFilterMax="1000.0 1000.0"
-/>
-
diff --git a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L1XX/L1XX.xml b/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L1XX/L1XX.xml
deleted file mode 100755
index 0e9a1265e..000000000
--- a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L1XX/L1XX.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<SRTLPBandReceiverModeSetup xmlns="urn:schemas-cosylab-com:SRTLPBandReceiverModeSetup:1.0"
-xmlns:baci="urn:schemas-cosylab-com:BACI:1.0"
-xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-
-Mode="L1XX"
-PBandRFMin="305.0 305.0"
-PBandRFMax="410.0 410.0"
-LBandRFMin="1300.0 1300.0"
-LBandRFMax="1800.0 1800.0"
-PBandFilterID="1"
-LBandFilterID="1"
-IFs="2"
-PBandIFMin="305.0 305.0"
-LBandIFMin="1300.0 1300.0"
-Feeds="1" 
-LBandPolarization="L R"
-PBandPolarization="H V"
-DefaultLO="2324.0 2324.0"
-FixedLO2="0.0 0.0"
-LOMin="0.0 0.0"
-LOMax="3000.0 3000.0"
-LowpassFilterMin="0.0 0.0"
-LowpassFilterMax="1000.0 1000.0"
-/>
-
diff --git a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L2C1/L2C1.xml b/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L2C1/L2C1.xml
deleted file mode 100755
index 11ea5d837..000000000
--- a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L2C1/L2C1.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<SRTLPBandReceiverModeSetup xmlns="urn:schemas-cosylab-com:SRTLPBandReceiverModeSetup:1.0"
-xmlns:baci="urn:schemas-cosylab-com:BACI:1.0"
-xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-
-Mode="L2C1"
-PBandRFMin="310.0 310.0"
-PBandRFMax="350.0 350.0"
-LBandRFMin="1300.0 1300.0"
-LBandRFMax="1800.0 1800.0"
-PBandFilterID="2"
-LBandFilterID="1"
-IFs="2"
-PBandIFMin="310.0 310.0"
-LBandIFMin="1300.0 1300.0"
-Feeds="2" 
-PBandPolarization="H V"
-LBandPolarization="L R"
-DefaultLO="2324.0 2324.0"
-FixedLO2="0.0 0.0"
-LOMin="0.0 0.0"
-LOMax="3000.0 3000.0"
-LowpassFilterMin="0.0 0.0"
-LowpassFilterMax="1000.0 1000.0"
-/>
-
diff --git a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L2C2/L2C2.xml b/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L2C2/L2C2.xml
deleted file mode 100755
index 0aebdfc9a..000000000
--- a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L2C2/L2C2.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<SRTLPBandReceiverModeSetup xmlns="urn:schemas-cosylab-com:SRTLPBandReceiverModeSetup:1.0"
-xmlns:baci="urn:schemas-cosylab-com:BACI:1.0"
-xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-
-Mode="L2C2"
-PBandRFMin="310.0 310.0"
-PBandRFMax="350.0 350.0"
-LBandRFMin="1320.0 1320.0"
-LBandRFMax="1780.0 1780.0"
-PBandFilterID="2"
-LBandFilterID="2"
-IFs="2"
-PBandIFMin="310.0 310.0"
-LBandIFMin="1320.0 1320.0"
-Feeds="2" 
-PBandPolarization="H V"
-LBandPolarization="L R"
-DefaultLO="2324.0 2324.0"
-FixedLO2="0.0 0.0"
-LOMin="0.0 0.0"
-LOMax="3000.0 3000.0"
-LowpassFilterMin="0.0 0.0"
-LowpassFilterMax="1000.0 1000.0"
-/>
-
diff --git a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L2C3/L2C3.xml b/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L2C3/L2C3.xml
deleted file mode 100755
index 4759629e3..000000000
--- a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L2C3/L2C3.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<SRTLPBandReceiverModeSetup xmlns="urn:schemas-cosylab-com:SRTLPBandReceiverModeSetup:1.0"
-xmlns:baci="urn:schemas-cosylab-com:BACI:1.0"
-xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-
-Mode="L2C3"
-PBandRFMin="310.0 310.0"
-PBandRFMax="350.0 350.0"
-LBandRFMin="1350.0 1350.0"
-LBandRFMax="1450.0 1450.0"
-PBandFilterID="2"
-LBandFilterID="3"
-IFs="2"
-PBandIFMin="310.0 310.0"
-LBandIFMin="1350.0 1350.0"
-Feeds="2" 
-PBandPolarization="H V"
-LBandPolarization="L R"
-DefaultLO="2324.0 2324.0"
-FixedLO2="0.0 0.0"
-LOMin="0.0 0.0"
-LOMax="3000.0 3000.0"
-LowpassFilterMin="0.0 0.0"
-LowpassFilterMax="1000.0 1000.0"
-/>
-
diff --git a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L2C4/L2C4.xml b/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L2C4/L2C4.xml
deleted file mode 100755
index 35941cc4b..000000000
--- a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L2C4/L2C4.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<SRTLPBandReceiverModeSetup xmlns="urn:schemas-cosylab-com:SRTLPBandReceiverModeSetup:1.0"
-xmlns:baci="urn:schemas-cosylab-com:BACI:1.0"
-xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-
-Mode="L2C4"
-PBandRFMin="310.0 310.0"
-PBandRFMax="350.0 350.0"
-LBandRFMin="1300.0 1300.0"
-LBandRFMax="1800.0 1800.0"
-PBandFilterID="2"
-LBandFilterID="4"
-IFs="2"
-PBandIFMin="310.0 310.0"
-LBandIFMin="1300.0 1300.0"
-Feeds="2" 
-PBandPolarization="H V"
-LBandPolarization="L R"
-DefaultLO="2324.0 2324.0"
-FixedLO2="0.0 0.0"
-LOMin="0.0 0.0"
-LOMax="3000.0 3000.0"
-LowpassFilterMin="0.0 0.0"
-LowpassFilterMax="1000.0 1000.0"
-/>
-
diff --git a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L2C5/L2C5.xml b/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L2C5/L2C5.xml
deleted file mode 100755
index 5a71cc9bd..000000000
--- a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L2C5/L2C5.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<SRTLPBandReceiverModeSetup xmlns="urn:schemas-cosylab-com:SRTLPBandReceiverModeSetup:1.0"
-xmlns:baci="urn:schemas-cosylab-com:BACI:1.0"
-xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-
-Mode="L2C5"
-PBandRFMin="310.0 310.0"
-PBandRFMax="350.0 350.0"
-LBandRFMin="1625.0 1625.0"
-LBandRFMax="1715.0 1715.0"
-PBandFilterID="2"
-LBandFilterID="5"
-IFs="2"
-PBandIFMin="310.0 310.0"
-LBandIFMin="1625.0 1625.0"
-Feeds="2" 
-PBandPolarization="H V"
-LBandPolarization="L R"
-DefaultLO="2324.0 2324.0"
-FixedLO2="0.0 0.0"
-LOMin="0.0 0.0"
-LOMax="3000.0 3000.0"
-LowpassFilterMin="0.0 0.0"
-LowpassFilterMax="1000.0 1000.0"
-/>
-
diff --git a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L2L1/L2L1.xml b/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L2L1/L2L1.xml
deleted file mode 100755
index 965f288f5..000000000
--- a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L2L1/L2L1.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<SRTLPBandReceiverModeSetup xmlns="urn:schemas-cosylab-com:SRTLPBandReceiverModeSetup:1.0"
-xmlns:baci="urn:schemas-cosylab-com:BACI:1.0"
-xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-
-Mode="L2L1"
-PBandRFMin="310.0 310.0"
-PBandRFMax="350.0 350.0"
-LBandRFMin="1300.0 1300.0"
-LBandRFMax="1800.0 1800.0"
-PBandFilterID="2"
-LBandFilterID="1"
-IFs="2"
-PBandIFMin="310.0 310.0"
-LBandIFMin="1300.0 1300.0"
-Feeds="2" 
-PBandPolarization="H V"
-LBandPolarization="H V"
-DefaultLO="2324.0 2324.0"
-FixedLO2="0.0 0.0"
-LOMin="0.0 0.0"
-LOMax="3000.0 3000.0"
-LowpassFilterMin="0.0 0.0"
-LowpassFilterMax="1000.0 1000.0"
-/>
-
diff --git a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L2L2/L2L2.xml b/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L2L2/L2L2.xml
deleted file mode 100755
index 5246e2c67..000000000
--- a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L2L2/L2L2.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<SRTLPBandReceiverModeSetup xmlns="urn:schemas-cosylab-com:SRTLPBandReceiverModeSetup:1.0"
-xmlns:baci="urn:schemas-cosylab-com:BACI:1.0"
-xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-
-Mode="L2L2"
-PBandRFMin="310.0 310.0"
-PBandRFMax="350.0 350.0"
-LBandRFMin="1320.0 1320.0"
-LBandRFMax="1780.0 1780.0"
-PBandFilterID="2"
-LBandFilterID="2"
-IFs="2"
-PBandIFMin="310.0 310.0"
-LBandIFMin="1320.0 1320.0"
-Feeds="2" 
-PBandPolarization="H V"
-LBandPolarization="H V"
-DefaultLO="2324.0 2324.0"
-FixedLO2="0.0 0.0"
-LOMin="0.0 0.0"
-LOMax="3000.0 3000.0"
-LowpassFilterMin="0.0 0.0"
-LowpassFilterMax="1000.0 1000.0"
-/>
-
diff --git a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L2L3/L2L3.xml b/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L2L3/L2L3.xml
deleted file mode 100755
index 499981212..000000000
--- a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L2L3/L2L3.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<SRTLPBandReceiverModeSetup xmlns="urn:schemas-cosylab-com:SRTLPBandReceiverModeSetup:1.0"
-xmlns:baci="urn:schemas-cosylab-com:BACI:1.0"
-xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-
-Mode="L2L3"
-PBandRFMin="310.0 310.0"
-PBandRFMax="350.0 350.0"
-LBandRFMin="1350.0 1350.0"
-LBandRFMax="1450.0 1450.0"
-PBandFilterID="2"
-LBandFilterID="3"
-IFs="2"
-PBandIFMin="310.0 310.0"
-LBandIFMin="1350.0 1350.0"
-Feeds="2" 
-PBandPolarization="H V"
-LBandPolarization="H V"
-DefaultLO="2324.0 2324.0"
-FixedLO2="0.0 0.0"
-LOMin="0.0 0.0"
-LOMax="3000.0 3000.0"
-LowpassFilterMin="0.0 0.0"
-LowpassFilterMax="1000.0 1000.0"
-/>
-
diff --git a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L2L4/L2L4.xml b/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L2L4/L2L4.xml
deleted file mode 100755
index e187d9c24..000000000
--- a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L2L4/L2L4.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<SRTLPBandReceiverModeSetup xmlns="urn:schemas-cosylab-com:SRTLPBandReceiverModeSetup:1.0"
-xmlns:baci="urn:schemas-cosylab-com:BACI:1.0"
-xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-
-Mode="L2L4"
-PBandRFMin="310.0 310.0"
-PBandRFMax="350.0 350.0"
-LBandRFMin="1300.0 1300.0"
-LBandRFMax="1800.0 1800.0"
-PBandFilterID="2"
-LBandFilterID="4"
-IFs="2"
-PBandIFMin="310.0 310.0"
-LBandIFMin="1300.0 1300.0"
-Feeds="2" 
-PBandPolarization="H V"
-LBandPolarization="H V"
-DefaultLO="2324.0 2324.0"
-FixedLO2="0.0 0.0"
-LOMin="0.0 0.0"
-LOMax="3000.0 3000.0"
-LowpassFilterMin="0.0 0.0"
-LowpassFilterMax="1000.0 1000.0"
-/>
-
diff --git a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L2L5/L2L5.xml b/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L2L5/L2L5.xml
deleted file mode 100755
index d92449d7b..000000000
--- a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L2L5/L2L5.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<SRTLPBandReceiverModeSetup xmlns="urn:schemas-cosylab-com:SRTLPBandReceiverModeSetup:1.0"
-xmlns:baci="urn:schemas-cosylab-com:BACI:1.0"
-xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-
-Mode="L2L5"
-PBandRFMin="310.0 310.0"
-PBandRFMax="350.0 350.0"
-LBandRFMin="1625.0 1625.0"
-LBandRFMax="1715.0 1715.0"
-PBandFilterID="2"
-LBandFilterID="5"
-IFs="2"
-PBandIFMin="310.0 310.0"
-LBandIFMin="1625.0 1625.0"
-Feeds="2" 
-PBandPolarization="H V"
-LBandPolarization="H V"
-DefaultLO="2324.0 2324.0"
-FixedLO2="0.0 0.0"
-LOMin="0.0 0.0"
-LOMax="3000.0 3000.0"
-LowpassFilterMin="0.0 0.0"
-LowpassFilterMax="1000.0 1000.0"
-/>
-
diff --git a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L2XX/L2XX.xml b/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L2XX/L2XX.xml
deleted file mode 100755
index 6cf6a3d80..000000000
--- a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L2XX/L2XX.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<SRTLPBandReceiverModeSetup xmlns="urn:schemas-cosylab-com:SRTLPBandReceiverModeSetup:1.0"
-xmlns:baci="urn:schemas-cosylab-com:BACI:1.0"
-xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-
-Mode="L2XX"
-PBandRFMin="310.0 310.0"
-PBandRFMax="350.0 350.0"
-LBandRFMin="1300.0 1300.0"
-LBandRFMax="1800.0 1800.0"
-PBandFilterID="2"
-LBandFilterID="1"
-IFs="2"
-PBandIFMin="310.0 310.0"
-LBandIFMin="1300.0 1300.0"
-Feeds="1" 
-LBandPolarization="L R"
-PBandPolarization="H V"
-DefaultLO="2324.0 2324.0"
-FixedLO2="0.0 0.0"
-LOMin="0.0 0.0"
-LOMax="3000.0 3000.0"
-LowpassFilterMin="0.0 0.0"
-LowpassFilterMax="1000.0 1000.0"
-/>
-
diff --git a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L3C1/L3C1.xml b/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L3C1/L3C1.xml
deleted file mode 100755
index 3da871496..000000000
--- a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L3C1/L3C1.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<SRTLPBandReceiverModeSetup xmlns="urn:schemas-cosylab-com:SRTLPBandReceiverModeSetup:1.0"
-xmlns:baci="urn:schemas-cosylab-com:BACI:1.0"
-xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-
-Mode="L3C1"
-PBandRFMin="305.0 305.0"
-PBandRFMax="410.0 410.0"
-LBandRFMin="1300.0 1300.0"
-LBandRFMax="1800.0 1800.0"
-PBandFilterID="3"
-LBandFilterID="1"
-IFs="2"
-PBandIFMin="305.0 305.0"
-LBandIFMin="1300.0 1300.0"
-Feeds="2" 
-PBandPolarization="H V"
-LBandPolarization="L R"
-DefaultLO="2324.0 2324.0"
-FixedLO2="0.0 0.0"
-LOMin="0.0 0.0"
-LOMax="3000.0 3000.0"
-LowpassFilterMin="0.0 0.0"
-LowpassFilterMax="1000.0 1000.0"
-/>
-
diff --git a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L3C2/L3C2.xml b/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L3C2/L3C2.xml
deleted file mode 100755
index d529c01e7..000000000
--- a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L3C2/L3C2.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<SRTLPBandReceiverModeSetup xmlns="urn:schemas-cosylab-com:SRTLPBandReceiverModeSetup:1.0"
-xmlns:baci="urn:schemas-cosylab-com:BACI:1.0"
-xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-
-Mode="L3C2"
-PBandRFMin="305.0 305.0"
-PBandRFMax="410.0 410.0"
-LBandRFMin="1320.0 1320.0"
-LBandRFMax="1780.0 1780.0"
-PBandFilterID="3"
-LBandFilterID="2"
-IFs="2"
-PBandIFMin="305.0 305.0"
-LBandIFMin="1320.0 1320.0"
-Feeds="2" 
-PBandPolarization="H V"
-LBandPolarization="L R"
-DefaultLO="2324.0 2324.0"
-FixedLO2="0.0 0.0"
-LOMin="0.0 0.0"
-LOMax="3000.0 3000.0"
-LowpassFilterMin="0.0 0.0"
-LowpassFilterMax="1000.0 1000.0"
-/>
-
diff --git a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L3C3/L3C3.xml b/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L3C3/L3C3.xml
deleted file mode 100755
index cd7f901ac..000000000
--- a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L3C3/L3C3.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<SRTLPBandReceiverModeSetup xmlns="urn:schemas-cosylab-com:SRTLPBandReceiverModeSetup:1.0"
-xmlns:baci="urn:schemas-cosylab-com:BACI:1.0"
-xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-
-Mode="L3C3"
-PBandRFMin="305.0 305.0"
-PBandRFMax="410.0 410.0"
-LBandRFMin="1350.0 1350.0"
-LBandRFMax="1450.0 1450.0"
-PBandFilterID="3"
-LBandFilterID="3"
-IFs="2"
-PBandIFMin="305.0 305.0"
-LBandIFMin="1350.0 1350.0"
-Feeds="2" 
-PBandPolarization="H V"
-LBandPolarization="L R"
-DefaultLO="2324.0 2324.0"
-FixedLO2="0.0 0.0"
-LOMin="0.0 0.0"
-LOMax="3000.0 3000.0"
-LowpassFilterMin="0.0 0.0"
-LowpassFilterMax="1000.0 1000.0"
-/>
-
diff --git a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L3C4/L3C4.xml b/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L3C4/L3C4.xml
deleted file mode 100755
index 298787cb0..000000000
--- a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L3C4/L3C4.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<SRTLPBandReceiverModeSetup xmlns="urn:schemas-cosylab-com:SRTLPBandReceiverModeSetup:1.0"
-xmlns:baci="urn:schemas-cosylab-com:BACI:1.0"
-xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-
-Mode="L3C4"
-PBandRFMin="305.0 305.0"
-PBandRFMax="410.0 410.0"
-LBandRFMin="1300.0 1300.0"
-LBandRFMax="1800.0 1800.0"
-PBandFilterID="3"
-LBandFilterID="4"
-IFs="2"
-PBandIFMin="305.0 305.0"
-LBandIFMin="1300.0 1300.0"
-Feeds="2" 
-PBandPolarization="H V"
-LBandPolarization="L R"
-DefaultLO="2324.0 2324.0"
-FixedLO2="0.0 0.0"
-LOMin="0.0 0.0"
-LOMax="3000.0 3000.0"
-LowpassFilterMin="0.0 0.0"
-LowpassFilterMax="1000.0 1000.0"
-/>
-
diff --git a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L3C5/L3C5.xml b/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L3C5/L3C5.xml
deleted file mode 100755
index e9ba2b21f..000000000
--- a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L3C5/L3C5.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<SRTLPBandReceiverModeSetup xmlns="urn:schemas-cosylab-com:SRTLPBandReceiverModeSetup:1.0"
-xmlns:baci="urn:schemas-cosylab-com:BACI:1.0"
-xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-
-Mode="L3C5"
-PBandRFMin="305.0 305.0"
-PBandRFMax="410.0 410.0"
-LBandRFMin="1625.0 1625.0"
-LBandRFMax="1715.0 1715.0"
-PBandFilterID="3"
-LBandFilterID="5"
-IFs="2"
-PBandIFMin="305.0 305.0"
-LBandIFMin="1625.0 1625.0"
-Feeds="2" 
-PBandPolarization="H V"
-LBandPolarization="L R"
-DefaultLO="2324.0 2324.0"
-FixedLO2="0.0 0.0"
-LOMin="0.0 0.0"
-LOMax="3000.0 3000.0"
-LowpassFilterMin="0.0 0.0"
-LowpassFilterMax="1000.0 1000.0"
-/>
-
diff --git a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L3L1/L3L1.xml b/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L3L1/L3L1.xml
deleted file mode 100755
index f3bb74695..000000000
--- a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L3L1/L3L1.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<SRTLPBandReceiverModeSetup xmlns="urn:schemas-cosylab-com:SRTLPBandReceiverModeSetup:1.0"
-xmlns:baci="urn:schemas-cosylab-com:BACI:1.0"
-xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-
-Mode="L3L1"
-PBandRFMin="305.0 305.0"
-PBandRFMax="410.0 410.0"
-LBandRFMin="1300.0 1300.0"
-LBandRFMax="1800.0 1800.0"
-PBandFilterID="3"
-LBandFilterID="1"
-IFs="2"
-PBandIFMin="305.0 305.0"
-LBandIFMin="1300.0 1300.0"
-Feeds="2" 
-PBandPolarization="H V"
-LBandPolarization="H V"
-DefaultLO="2324.0 2324.0"
-FixedLO2="0.0 0.0"
-LOMin="0.0 0.0"
-LOMax="3000.0 3000.0"
-LowpassFilterMin="0.0 0.0"
-LowpassFilterMax="1000.0 1000.0"
-/>
-
diff --git a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L3L2/L3L2.xml b/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L3L2/L3L2.xml
deleted file mode 100755
index 888c4be95..000000000
--- a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L3L2/L3L2.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<SRTLPBandReceiverModeSetup xmlns="urn:schemas-cosylab-com:SRTLPBandReceiverModeSetup:1.0"
-xmlns:baci="urn:schemas-cosylab-com:BACI:1.0"
-xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-
-Mode="L3L2"
-PBandRFMin="305.0 305.0"
-PBandRFMax="410.0 410.0"
-LBandRFMin="1320.0 1320.0"
-LBandRFMax="1780.0 1780.0"
-PBandFilterID="3"
-LBandFilterID="2"
-IFs="2"
-PBandIFMin="305.0 305.0"
-LBandIFMin="1320.0 1320.0"
-Feeds="2" 
-PBandPolarization="H V"
-LBandPolarization="H V"
-DefaultLO="2324.0 2324.0"
-FixedLO2="0.0 0.0"
-LOMin="0.0 0.0"
-LOMax="3000.0 3000.0"
-LowpassFilterMin="0.0 0.0"
-LowpassFilterMax="1000.0 1000.0"
-/>
-
diff --git a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L3L3/L3L3.xml b/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L3L3/L3L3.xml
deleted file mode 100755
index b5677847c..000000000
--- a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L3L3/L3L3.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<SRTLPBandReceiverModeSetup xmlns="urn:schemas-cosylab-com:SRTLPBandReceiverModeSetup:1.0"
-xmlns:baci="urn:schemas-cosylab-com:BACI:1.0"
-xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-
-Mode="L3L3"
-PBandRFMin="305.0 305.0"
-PBandRFMax="410.0 410.0"
-LBandRFMin="1350.0 1350.0"
-LBandRFMax="1450.0 1450.0"
-PBandFilterID="3"
-LBandFilterID="3"
-IFs="2"
-PBandIFMin="305.0 305.0"
-LBandIFMin="1350.0 1350.0"
-Feeds="2" 
-PBandPolarization="H V"
-LBandPolarization="H V"
-DefaultLO="2324.0 2324.0"
-FixedLO2="0.0 0.0"
-LOMin="0.0 0.0"
-LOMax="3000.0 3000.0"
-LowpassFilterMin="0.0 0.0"
-LowpassFilterMax="1000.0 1000.0"
-/>
-
diff --git a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L3L4/L3L4.xml b/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L3L4/L3L4.xml
deleted file mode 100755
index 84b1cdb86..000000000
--- a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L3L4/L3L4.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<SRTLPBandReceiverModeSetup xmlns="urn:schemas-cosylab-com:SRTLPBandReceiverModeSetup:1.0"
-xmlns:baci="urn:schemas-cosylab-com:BACI:1.0"
-xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-
-Mode="L3L4"
-PBandRFMin="305.0 305.0"
-PBandRFMax="410.0 410.0"
-LBandRFMin="1300.0 1300.0"
-LBandRFMax="1800.0 1800.0"
-PBandFilterID="3"
-LBandFilterID="4"
-IFs="2"
-PBandIFMin="305.0 305.0"
-LBandIFMin="1300.0 1300.0"
-Feeds="2" 
-PBandPolarization="H V"
-LBandPolarization="H V"
-DefaultLO="2324.0 2324.0"
-FixedLO2="0.0 0.0"
-LOMin="0.0 0.0"
-LOMax="3000.0 3000.0"
-LowpassFilterMin="0.0 0.0"
-LowpassFilterMax="1000.0 1000.0"
-/>
-
diff --git a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L3L5/L3L5.xml b/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L3L5/L3L5.xml
deleted file mode 100755
index a7b81c097..000000000
--- a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L3L5/L3L5.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<SRTLPBandReceiverModeSetup xmlns="urn:schemas-cosylab-com:SRTLPBandReceiverModeSetup:1.0"
-xmlns:baci="urn:schemas-cosylab-com:BACI:1.0"
-xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-
-Mode="L3L5"
-PBandRFMin="305.0 305.0"
-PBandRFMax="410.0 410.0"
-LBandRFMin="1625.0 1625.0"
-LBandRFMax="1715.0 1715.0"
-PBandFilterID="3"
-LBandFilterID="5"
-IFs="2"
-PBandIFMin="305.0 305.0"
-LBandIFMin="1625.0 1625.0"
-Feeds="2" 
-PBandPolarization="H V"
-LBandPolarization="H V"
-DefaultLO="2324.0 2324.0"
-FixedLO2="0.0 0.0"
-LOMin="0.0 0.0"
-LOMax="3000.0 3000.0"
-LowpassFilterMin="0.0 0.0"
-LowpassFilterMax="1000.0 1000.0"
-/>
-
diff --git a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L3XX/L3XX.xml b/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L3XX/L3XX.xml
deleted file mode 100755
index 048c849e3..000000000
--- a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L3XX/L3XX.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<SRTLPBandReceiverModeSetup xmlns="urn:schemas-cosylab-com:SRTLPBandReceiverModeSetup:1.0"
-xmlns:baci="urn:schemas-cosylab-com:BACI:1.0"
-xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-
-Mode="L3XX"
-PBandRFMin="305.0 305.0"
-PBandRFMax="410.0 410.0"
-LBandRFMin="1300.0 1300.0"
-LBandRFMax="1800.0 1800.0"
-PBandFilterID="3"
-LBandFilterID="1"
-IFs="2"
-PBandIFMin="305.0 305.0"
-LBandIFMin="1300.0 1300.0"
-Feeds="1" 
-LBandPolarization="L R"
-PBandPolarization="H V"
-DefaultLO="2324.0 2324.0"
-FixedLO2="0.0 0.0"
-LOMin="0.0 0.0"
-LOMax="3000.0 3000.0"
-LowpassFilterMin="0.0 0.0"
-LowpassFilterMax="1000.0 1000.0"
-/>
-
diff --git a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/XXC1/XXC1.xml b/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/XXC1/XXC1.xml
deleted file mode 100755
index ac82399fd..000000000
--- a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/XXC1/XXC1.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<SRTLPBandReceiverModeSetup xmlns="urn:schemas-cosylab-com:SRTLPBandReceiverModeSetup:1.0"
-xmlns:baci="urn:schemas-cosylab-com:BACI:1.0"
-xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-
-Mode="XXC1"
-PBandRFMin="305.0 305.0"
-PBandRFMax="410.0 410.0"
-LBandRFMin="1300.0 1300.0"
-LBandRFMax="1800.0 1800.0"
-PBandFilterID="1"
-LBandFilterID="1"
-IFs="2"
-PBandIFMin="305.0 305.0"
-LBandIFMin="1300.0 1300.0"
-Feeds="1" 
-LBandPolarization="L R"
-PBandPolarization="L R"
-DefaultLO="2324.0 2324.0"
-FixedLO2="0.0 0.0"
-LOMin="0.0 0.0"
-LOMax="3000.0 3000.0"
-LowpassFilterMin="0.0 0.0"
-LowpassFilterMax="1000.0 1000.0"
-/>
-
diff --git a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/XXC2/XXC2.xml b/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/XXC2/XXC2.xml
deleted file mode 100755
index dad909161..000000000
--- a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/XXC2/XXC2.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<SRTLPBandReceiverModeSetup xmlns="urn:schemas-cosylab-com:SRTLPBandReceiverModeSetup:1.0"
-xmlns:baci="urn:schemas-cosylab-com:BACI:1.0"
-xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-
-Mode="XXC2"
-PBandRFMin="305.0 305.0"
-PBandRFMax="410.0 410.0"
-LBandRFMin="1320.0 1320.0"
-LBandRFMax="1780.0 1780.0"
-PBandFilterID="1"
-LBandFilterID="2"
-IFs="2"
-PBandIFMin="305.0 305.0"
-LBandIFMin="1320.0 1320.0"
-Feeds="1" 
-LBandPolarization="L R"
-PBandPolarization="L R"
-DefaultLO="2324.0 2324.0"
-FixedLO2="0.0 0.0"
-LOMin="0.0 0.0"
-LOMax="3000.0 3000.0"
-LowpassFilterMin="0.0 0.0"
-LowpassFilterMax="1000.0 1000.0"
-/>
-
diff --git a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/XXC3/XXC3.xml b/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/XXC3/XXC3.xml
deleted file mode 100755
index c3987d50a..000000000
--- a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/XXC3/XXC3.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<SRTLPBandReceiverModeSetup xmlns="urn:schemas-cosylab-com:SRTLPBandReceiverModeSetup:1.0"
-xmlns:baci="urn:schemas-cosylab-com:BACI:1.0"
-xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-
-Mode="XXC3"
-PBandRFMin="305.0 305.0"
-PBandRFMax="410.0 410.0"
-LBandRFMin="1350.0 1350.0"
-LBandRFMax="1450.0 1450.0"
-PBandFilterID="1"
-LBandFilterID="3"
-IFs="2"
-PBandIFMin="305.0 305.0"
-LBandIFMin="1350.0 1350.0"
-Feeds="1" 
-LBandPolarization="L R"
-PBandPolarization="L R"
-DefaultLO="2324.0 2324.0"
-FixedLO2="0.0 0.0"
-LOMin="0.0 0.0"
-LOMax="3000.0 3000.0"
-LowpassFilterMin="0.0 0.0"
-LowpassFilterMax="1000.0 1000.0"
-/>
-
diff --git a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/XXC4/XXC4.xml b/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/XXC4/XXC4.xml
deleted file mode 100755
index 612d1e291..000000000
--- a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/XXC4/XXC4.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<SRTLPBandReceiverModeSetup xmlns="urn:schemas-cosylab-com:SRTLPBandReceiverModeSetup:1.0"
-xmlns:baci="urn:schemas-cosylab-com:BACI:1.0"
-xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-
-Mode="XXC4"
-PBandRFMin="305.0 305.0"
-PBandRFMax="410.0 410.0"
-LBandRFMin="1300.0 1300.0"
-LBandRFMax="1800.0 1800.0"
-PBandFilterID="1"
-LBandFilterID="4"
-IFs="2"
-PBandIFMin="305.0 305.0"
-LBandIFMin="1300.0 1300.0"
-Feeds="1" 
-LBandPolarization="L R"
-PBandPolarization="L R"
-DefaultLO="2324.0 2324.0"
-FixedLO2="0.0 0.0"
-LOMin="0.0 0.0"
-LOMax="3000.0 3000.0"
-LowpassFilterMin="0.0 0.0"
-LowpassFilterMax="1000.0 1000.0"
-/>
-
diff --git a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/XXC5/XXC5.xml b/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/XXC5/XXC5.xml
deleted file mode 100755
index d3b3bfaec..000000000
--- a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/XXC5/XXC5.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<SRTLPBandReceiverModeSetup xmlns="urn:schemas-cosylab-com:SRTLPBandReceiverModeSetup:1.0"
-xmlns:baci="urn:schemas-cosylab-com:BACI:1.0"
-xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-
-Mode="XXC5"
-PBandRFMin="305.0 305.0"
-PBandRFMax="410.0 410.0"
-LBandRFMin="1625.0 1625.0"
-LBandRFMax="1715.0 1715.0"
-PBandFilterID="1"
-LBandFilterID="5"
-IFs="2"
-PBandIFMin="305.0 305.0"
-LBandIFMin="1625.0 1625.0"
-Feeds="1" 
-LBandPolarization="L R"
-PBandPolarization="L R"
-DefaultLO="2324.0 2324.0"
-FixedLO2="0.0 0.0"
-LOMin="0.0 0.0"
-LOMax="3000.0 3000.0"
-LowpassFilterMin="0.0 0.0"
-LowpassFilterMax="1000.0 1000.0"
-/>
-
diff --git a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/XXL1/XXL1.xml b/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/XXL1/XXL1.xml
deleted file mode 100755
index 5d1c6d0eb..000000000
--- a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/XXL1/XXL1.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<SRTLPBandReceiverModeSetup xmlns="urn:schemas-cosylab-com:SRTLPBandReceiverModeSetup:1.0"
-xmlns:baci="urn:schemas-cosylab-com:BACI:1.0"
-xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-
-Mode="XXL1"
-PBandRFMin="305.0 305.0"
-PBandRFMax="410.0 410.0"
-LBandRFMin="1300.0 1300.0"
-LBandRFMax="1800.0 1800.0"
-PBandFilterID="1"
-LBandFilterID="1"
-IFs="2"
-PBandIFMin="305.0 305.0"
-LBandIFMin="1300.0 1300.0"
-Feeds="1" 
-LBandPolarization="H V"
-PBandPolarization="L R"
-DefaultLO="2324.0 2324.0"
-FixedLO2="0.0 0.0"
-LOMin="0.0 0.0"
-LOMax="3000.0 3000.0"
-LowpassFilterMin="0.0 0.0"
-LowpassFilterMax="1000.0 1000.0"
-/>
-
diff --git a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/XXL2/XXL2.xml b/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/XXL2/XXL2.xml
deleted file mode 100755
index 88698ade9..000000000
--- a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/XXL2/XXL2.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<SRTLPBandReceiverModeSetup xmlns="urn:schemas-cosylab-com:SRTLPBandReceiverModeSetup:1.0"
-xmlns:baci="urn:schemas-cosylab-com:BACI:1.0"
-xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-
-Mode="XXL2"
-PBandRFMin="305.0 305.0"
-PBandRFMax="410.0 410.0"
-LBandRFMin="1320.0 1320.0"
-LBandRFMax="1780.0 1780.0"
-PBandFilterID="1"
-LBandFilterID="2"
-IFs="2"
-PBandIFMin="305.0 305.0"
-LBandIFMin="1320.0 1320.0"
-Feeds="1" 
-LBandPolarization="H V"
-PBandPolarization="L R"
-DefaultLO="2324.0 2324.0"
-FixedLO2="0.0 0.0"
-LOMin="0.0 0.0"
-LOMax="3000.0 3000.0"
-LowpassFilterMin="0.0 0.0"
-LowpassFilterMax="1000.0 1000.0"
-/>
-
diff --git a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/XXL3/XXL3.xml b/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/XXL3/XXL3.xml
deleted file mode 100755
index d7046bc61..000000000
--- a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/XXL3/XXL3.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<SRTLPBandReceiverModeSetup xmlns="urn:schemas-cosylab-com:SRTLPBandReceiverModeSetup:1.0"
-xmlns:baci="urn:schemas-cosylab-com:BACI:1.0"
-xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-
-Mode="XXL3"
-PBandRFMin="305.0 305.0"
-PBandRFMax="410.0 410.0"
-LBandRFMin="1350.0 1350.0"
-LBandRFMax="1450.0 1450.0"
-PBandFilterID="1"
-LBandFilterID="3"
-IFs="2"
-PBandIFMin="305.0 305.0"
-LBandIFMin="1350.0 1350.0"
-Feeds="1" 
-LBandPolarization="H V"
-PBandPolarization="L R"
-DefaultLO="2324.0 2324.0"
-FixedLO2="0.0 0.0"
-LOMin="0.0 0.0"
-LOMax="3000.0 3000.0"
-LowpassFilterMin="0.0 0.0"
-LowpassFilterMax="1000.0 1000.0"
-/>
-
diff --git a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/XXL4/XXL4.xml b/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/XXL4/XXL4.xml
deleted file mode 100755
index b19421f85..000000000
--- a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/XXL4/XXL4.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<SRTLPBandReceiverModeSetup xmlns="urn:schemas-cosylab-com:SRTLPBandReceiverModeSetup:1.0"
-xmlns:baci="urn:schemas-cosylab-com:BACI:1.0"
-xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-
-Mode="XXL4"
-PBandRFMin="305.0 305.0"
-PBandRFMax="410.0 410.0"
-LBandRFMin="1300.0 1300.0"
-LBandRFMax="1800.0 1800.0"
-PBandFilterID="1"
-LBandFilterID="4"
-IFs="2"
-PBandIFMin="305.0 305.0"
-LBandIFMin="1300.0 1300.0"
-Feeds="1" 
-LBandPolarization="H V"
-PBandPolarization="L R"
-DefaultLO="2324.0 2324.0"
-FixedLO2="0.0 0.0"
-LOMin="0.0 0.0"
-LOMax="3000.0 3000.0"
-LowpassFilterMin="0.0 0.0"
-LowpassFilterMax="1000.0 1000.0"
-/>
-
diff --git a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/XXL5/XXL5.xml b/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/XXL5/XXL5.xml
deleted file mode 100755
index 58d03bb99..000000000
--- a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/XXL5/XXL5.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<SRTLPBandReceiverModeSetup xmlns="urn:schemas-cosylab-com:SRTLPBandReceiverModeSetup:1.0"
-xmlns:baci="urn:schemas-cosylab-com:BACI:1.0"
-xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-
-Mode="XXL5"
-PBandRFMin="305.0 305.0"
-PBandRFMax="410.0 410.0"
-LBandRFMin="1625.0 1625.0"
-LBandRFMax="1715.0 1715.0"
-PBandFilterID="1"
-LBandFilterID="5"
-IFs="2"
-PBandIFMin="305.0 305.0"
-LBandIFMin="1625.0 1625.0"
-Feeds="1" 
-LBandPolarization="H V"
-PBandPolarization="L R"
-DefaultLO="2324.0 2324.0"
-FixedLO2="0.0 0.0"
-LOMin="0.0 0.0"
-LOMax="3000.0 3000.0"
-LowpassFilterMin="0.0 0.0"
-LowpassFilterMax="1000.0 1000.0"
-/>
-
diff --git a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/make_modes.py b/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/make_modes.py
deleted file mode 100755
index 8b18f3181..000000000
--- a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/make_modes.py
+++ /dev/null
@@ -1,208 +0,0 @@
-"""
-This script makes for each mode its directory and .xml file (Python 3.3 or higher)
-
-Each mode is composed by 4 characters, that indicate respectively the:
-
-    - P band polarization (*, L, C)
-    - P band filter ID (1, 2, 3):
-        * 1 -> all band filter, 305-410 no filter
-        * 2 -> 310-350 MHz
-        * 3 -> 305-410 MHz (band-pass filter)
-    - L band polarization (three character choices: *, L, C)
-    - L band filter ID (1, 2, 3, 4, 5):
-        * 1 -> all band filter, 1300-1800 no filter
-        * 2 -> 1320-1780 MHz
-        * 3 -> 1350-1450 MHz (VLBI)
-        * 4 -> 1300-1800 MHz (band-pass)
-        * 5 -> 1625-1715 MHz (VLBI)
-
-For instance, the code C1L2 means:
-
-    - Circular polarization of the P band
-    - Filter n.1 of the P band 
-    - Linear polarization of the L band
-    - Filter n.2 of the L band
-
-The * character means the corresponding value should not change. 
-For instance, the code *1** means:
-
-    - Do not change the polarization of the P band
-    - Filter n.1 of the P band
-    - Do not change the polarization of the L band
-    - Do not change the filter of the L band
-
-It is possible to use only one receiver. In the case the observer want to
-use the P band, the 2 characters of the mode related to the L band are "X".
-For instance, if we want to use a P band in circular polarization, with the
-filter n.2, the mode will be C2XX.
-"""
-
-import os
-
-pband_filters = {
-        1: (305.0, 410.0), # all band filter, 305-410 no filter
-        2: (310.0, 350.0), # 310-350 MHz
-        3: (305.0, 410.0)  # 305-410 MHz (band-pass filter)
-}
-
-lband_filters = {
-        1: (1300.0, 1800.0), # all band filter, 1300-1800 no filter 
-        2: (1320.0, 1780.0), # 1320-1780 MHz
-        3: (1350.0, 1450.0), # 1350-1450 MHz (VLBI)
-        4: (1300.0, 1800.0), # 1300-1800 MHz (band-pass)
-        5: (1625.0, 1715.0)  # 1625-1715 MHz (VLBI)
-}
-
-formatter = {
-    'default_lo': 2324.0,
-    'fixed_lo': 0.0,
-    'lo_min': 0.0,
-    'lo_max': 3000.0,
-    'lpfilter_min': 0.0,
-    'lpfilter_max': 1000.0,
-}
-
-
-for pband_pol in 'LC':
-    for lband_pol in 'LC':
-        for pid, pband in pband_filters.items():
-            for lid, lband in lband_filters.items():
-                code = "%s%s%s%s" %(pband_pol, pid, lband_pol, lid)
-                formatter['code'] = code
-                formatter['pband_pol'] = 'L R' if pband_pol == 'C' else 'H V'
-                formatter['lband_pol'] = 'L R' if lband_pol == 'C' else 'H V'
-                formatter['pband_rf_min'] = pband[0]
-                formatter['pband_rf_max'] = pband[1]
-                formatter['lband_rf_min'] = lband[0]
-                formatter['lband_rf_max'] = lband[1]
-                formatter['pband_filter_id'] = pid
-                formatter['lband_filter_id'] = lid
-                file_name = os.path.join(code, code + '.xml')
-                os.mkdir(code)
-                outfile = open(os.path.join(code, code + '.xml'), 'w')
-                text = """<?xml version='1.0' encoding='ISO-8859-1'?>
-                
-                <SRTLPBandReceiverModeSetup xmlns="urn:schemas-cosylab-com:SRTLPBandReceiverModeSetup:1.0"
-                	xmlns:baci="urn:schemas-cosylab-com:BACI:1.0"
-                	xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"
-                	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                	
-                	Mode="{code}"
-                    PBandRFMin="{pband_rf_min:.1f} {pband_rf_min:.1f}"
-                    PBandRFMax="{pband_rf_max:.1f} {pband_rf_max:.1f}"
-                    LBandRFMin="{lband_rf_min:.1f} {lband_rf_min:.1f}"
-                    LBandRFMax="{lband_rf_max:.1f} {lband_rf_max:.1f}"
-                    PBandFilterID="{pband_filter_id}"
-                    LBandFilterID="{lband_filter_id}"
-                    IFs="2"
-                    PBandIFMin="{pband_rf_min:.1f} {pband_rf_min:.1f}"
-                    LBandIFMin="{lband_rf_min:.1f} {lband_rf_min:.1f}"
-                    Feeds="2" 
-                    PBandPolarization="{pband_pol}"
-                    LBandPolarization="{lband_pol}"
-                    DefaultLO="{default_lo:.1f} {default_lo:.1f}"
-                    FixedLO2="{fixed_lo:.1f} {fixed_lo:.1f}"
-                    LOMin="{lo_min:.1f} {lo_min:.1f}"
-                    LOMax="{lo_max:.1f} {lo_max:.1f}"
-                    LowpassFilterMin="{lpfilter_min:.1f} {lpfilter_min:.1f}"
-                    LowpassFilterMax="{lpfilter_max:.1f} {lpfilter_max:.1f}"
-                />
-                """.format_map(formatter)
-                lines = [line.lstrip() + '\n' for line in text.split('\n')]
-                outfile.writelines(lines)
-
-
-pband_code = 'X'
-for lband_pol in 'LC':
-    for lid, lband in lband_filters.items():
-        code = "%s%s%s%s" %(pband_code, pband_code, lband_pol, lid)
-        formatter['code'] = code
-        formatter['pband_pol'] = 'L R'
-        formatter['lband_pol'] = 'L R' if lband_pol == 'C' else 'H V'
-        formatter['pband_rf_min'] = 305.0
-        formatter['pband_rf_max'] = 410.0
-        formatter['lband_rf_min'] = lband[0]
-        formatter['lband_rf_max'] = lband[1]
-        formatter['pband_filter_id'] = 1
-        formatter['lband_filter_id'] = lid
-        file_name = os.path.join(code, code + '.xml')
-        os.mkdir(code)
-        outfile = open(os.path.join(code, code + '.xml'), 'w')
-        text = """<?xml version='1.0' encoding='ISO-8859-1'?>
-        
-        <SRTLPBandReceiverModeSetup xmlns="urn:schemas-cosylab-com:SRTLPBandReceiverModeSetup:1.0"
-        	xmlns:baci="urn:schemas-cosylab-com:BACI:1.0"
-        	xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"
-        	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        	
-        	Mode="{code}"
-            PBandRFMin="{pband_rf_min:.1f} {pband_rf_min:.1f}"
-            PBandRFMax="{pband_rf_max:.1f} {pband_rf_max:.1f}"
-            LBandRFMin="{lband_rf_min:.1f} {lband_rf_min:.1f}"
-            LBandRFMax="{lband_rf_max:.1f} {lband_rf_max:.1f}"
-            PBandFilterID="{pband_filter_id}"
-            LBandFilterID="{lband_filter_id}"
-            IFs="2"
-            PBandIFMin="{pband_rf_min:.1f} {pband_rf_min:.1f}"
-            LBandIFMin="{lband_rf_min:.1f} {lband_rf_min:.1f}"
-            Feeds="1" 
-            LBandPolarization="{lband_pol}"
-            PBandPolarization="{pband_pol}"
-            DefaultLO="{default_lo:.1f} {default_lo:.1f}"
-            FixedLO2="{fixed_lo:.1f} {fixed_lo:.1f}"
-            LOMin="{lo_min:.1f} {lo_min:.1f}"
-            LOMax="{lo_max:.1f} {lo_max:.1f}"
-            LowpassFilterMin="{lpfilter_min:.1f} {lpfilter_min:.1f}"
-            LowpassFilterMax="{lpfilter_max:.1f} {lpfilter_max:.1f}"
-        />
-        """.format_map(formatter)
-        lines = [line.lstrip() + '\n' for line in text.split('\n')]
-        outfile.writelines(lines)
-
-
-lband_code = 'X'
-for pband_pol in 'LC':
-    for pid, pband in pband_filters.items():
-        code = "%s%s%s%s" %(pband_pol, pid, lband_code, lband_code)
-        formatter['code'] = code
-        formatter['pband_pol'] = 'L R' if pband_pol == 'C' else 'H V'
-        formatter['lband_pol'] = 'L R'
-        formatter['pband_rf_min'] = pband[0]
-        formatter['pband_rf_max'] = pband[1]
-        formatter['lband_rf_min'] = 1300.0
-        formatter['lband_rf_max'] = 1800.0
-        formatter['pband_filter_id'] = pid
-        formatter['lband_filter_id'] = 1
-        file_name = os.path.join(code, code + '.xml')
-        os.mkdir(code)
-        outfile = open(os.path.join(code, code + '.xml'), 'w')
-        text = """<?xml version='1.0' encoding='ISO-8859-1'?>
-        
-        <SRTLPBandReceiverModeSetup xmlns="urn:schemas-cosylab-com:SRTLPBandReceiverModeSetup:1.0"
-        	xmlns:baci="urn:schemas-cosylab-com:BACI:1.0"
-        	xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"
-        	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        	
-        	Mode="{code}"
-            PBandRFMin="{pband_rf_min:.1f} {pband_rf_min:.1f}"
-            PBandRFMax="{pband_rf_max:.1f} {pband_rf_max:.1f}"
-            LBandRFMin="{lband_rf_min:.1f} {lband_rf_min:.1f}"
-            LBandRFMax="{lband_rf_max:.1f} {lband_rf_max:.1f}"
-            PBandFilterID="{pband_filter_id}"
-            LBandFilterID="{lband_filter_id}"
-            IFs="2"
-            PBandIFMin="{pband_rf_min:.1f} {pband_rf_min:.1f}"
-            LBandIFMin="{lband_rf_min:.1f} {lband_rf_min:.1f}"
-            Feeds="1" 
-            LBandPolarization="{lband_pol}"
-            PBandPolarization="{pband_pol}"
-            DefaultLO="{default_lo:.1f} {default_lo:.1f}"
-            FixedLO2="{fixed_lo:.1f} {fixed_lo:.1f}"
-            LOMin="{lo_min:.1f} {lo_min:.1f}"
-            LOMax="{lo_max:.1f} {lo_max:.1f}"
-            LowpassFilterMin="{lpfilter_min:.1f} {lpfilter_min:.1f}"
-            LowpassFilterMax="{lpfilter_max:.1f} {lpfilter_max:.1f}"
-        />
-        """.format_map(formatter)
-        lines = [line.lstrip() + '\n' for line in text.split('\n')]
-        outfile.writelines(lines)
diff --git a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Synthesizer/Synthesizer.xml b/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Synthesizer/Synthesizer.xml
deleted file mode 100644
index 83793c03b..000000000
--- a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Synthesizer/Synthesizer.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<LocalOscillatorLookUpTable xmlns="urn:schemas-cosylab-com:LocalOscillatorLookUpTable:1.0"
-             	xmlns:baci="urn:schemas-cosylab-com:BACI:1.0"
-				xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"
-				xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
-<SynthesizerEntry><Frequency>0.0</Frequency><OutputPower>19.0</OutputPower></SynthesizerEntry>
-
-<SynthesizerEntry><Frequency>400.0</Frequency><OutputPower>19.0</OutputPower></SynthesizerEntry>
-
-<SynthesizerEntry><Frequency>800.0</Frequency><OutputPower>19.0</OutputPower></SynthesizerEntry>
-
-<SynthesizerEntry><Frequency>1200.0</Frequency><OutputPower>19.0</OutputPower></SynthesizerEntry>
-
-<SynthesizerEntry><Frequency>1600.0</Frequency><OutputPower>19.0</OutputPower></SynthesizerEntry>
-
-<SynthesizerEntry><Frequency>2000.0</Frequency><OutputPower>19.0</OutputPower></SynthesizerEntry>
-
-<SynthesizerEntry><Frequency>2400.0</Frequency><OutputPower>19.0</OutputPower></SynthesizerEntry>
-
-</LocalOscillatorLookUpTable>
diff --git a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Taper/Taper.xml b/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Taper/Taper.xml
deleted file mode 100755
index abcfab1de..000000000
--- a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/Taper/Taper.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
-
-<SRTLPBandTaperLookUpTable xmlns="urn:schemas-cosylab-com:SRTLPBandTaperLookUpTable:1.0"
-             	xmlns:baci="urn:schemas-cosylab-com:BACI:1.0"
-				xmlns:cdb="urn:schemas-cosylab-com:CDB:1.0"
-				xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
-<TaperEntry><Feed>0</Feed><Frequency>300</Frequency><Taper>-13.0</Taper></TaperEntry>
-<TaperEntry><Feed>0</Feed><Frequency>350</Frequency><Taper>-15.0</Taper></TaperEntry>
-<TaperEntry><Feed>0</Feed><Frequency>410</Frequency><Taper>-17.0</Taper></TaperEntry>
-
-<TaperEntry><Feed>1</Feed><Frequency>1300</Frequency><Taper>-15.0</Taper></TaperEntry>
-<TaperEntry><Feed>1</Feed><Frequency>1550</Frequency><Taper>-14.0</Taper></TaperEntry>
-<TaperEntry><Feed>1</Feed><Frequency>1800</Frequency><Taper>-17.0</Taper></TaperEntry>
-
-</SRTLPBandTaperLookUpTable>
diff --git a/SRT/Outdated/CDB/MACI/.gitignore b/SRT/Outdated/CDB/MACI/.gitignore
new file mode 100644
index 000000000..f83a0eb46
--- /dev/null
+++ b/SRT/Outdated/CDB/MACI/.gitignore
@@ -0,0 +1 @@
+# This file only exists here in order to prevent the directory from being ignored by git if empty
diff --git a/SRT/Configuration/CDB/MACI/Components/BACKENDS/DXC2/DXC2.xml b/SRT/Outdated/CDB/MACI/Components/BACKENDS/DXC2/DXC2.xml
similarity index 100%
rename from SRT/Configuration/CDB/MACI/Components/BACKENDS/DXC2/DXC2.xml
rename to SRT/Outdated/CDB/MACI/Components/BACKENDS/DXC2/DXC2.xml
diff --git a/SRT/Configuration/CDB/MACI/Components/BACKENDS/Holography/Holography.xml b/SRT/Outdated/CDB/MACI/Components/BACKENDS/Holography/Holography.xml
similarity index 100%
rename from SRT/Configuration/CDB/MACI/Components/BACKENDS/Holography/Holography.xml
rename to SRT/Outdated/CDB/MACI/Components/BACKENDS/Holography/Holography.xml
diff --git a/Medicina/Configuration/CDB/alma/BACKENDS/NoiseGenerator/NoiseGenerator.xml b/SRT/Outdated/CDB/MACI/Components/BACKENDS/NoiseGenerator/NoiseGenerator.xml
similarity index 100%
rename from Medicina/Configuration/CDB/alma/BACKENDS/NoiseGenerator/NoiseGenerator.xml
rename to SRT/Outdated/CDB/MACI/Components/BACKENDS/NoiseGenerator/NoiseGenerator.xml
diff --git a/SRT/Configuration/CDB/MACI/Components/BACKENDS/XBackends/XBackends.xml b/SRT/Outdated/CDB/MACI/Components/BACKENDS/XBackends/XBackends.xml
similarity index 100%
rename from SRT/Configuration/CDB/MACI/Components/BACKENDS/XBackends/XBackends.xml
rename to SRT/Outdated/CDB/MACI/Components/BACKENDS/XBackends/XBackends.xml
diff --git a/SRT/Configuration/CDB/MACI/Components/MINORSERVO/PFP/PFP.xml b/SRT/Outdated/CDB/MACI/Components/MINORSERVO/PFP/PFP.xml
similarity index 100%
rename from SRT/Configuration/CDB/MACI/Components/MINORSERVO/PFP/PFP.xml
rename to SRT/Outdated/CDB/MACI/Components/MINORSERVO/PFP/PFP.xml
diff --git a/SRT/Configuration/CDB/MACI/Components/RECEIVERS/LO_LP/LO_LP.xml b/SRT/Outdated/CDB/MACI/Components/RECEIVERS/LO_LP/LO_LP.xml
similarity index 100%
rename from SRT/Configuration/CDB/MACI/Components/RECEIVERS/LO_LP/LO_LP.xml
rename to SRT/Outdated/CDB/MACI/Components/RECEIVERS/LO_LP/LO_LP.xml
diff --git a/SRT/CDB/MACI/Components/LO_SBAND/LO_SBAND.xml b/SRT/Outdated/CDB/MACI/Components/RECEIVERS/LO_SBAND/LO_SBAND.xml
similarity index 100%
rename from SRT/CDB/MACI/Components/LO_SBAND/LO_SBAND.xml
rename to SRT/Outdated/CDB/MACI/Components/RECEIVERS/LO_SBAND/LO_SBAND.xml
diff --git a/SRT/Configuration/CDB/MACI/Components/RECEIVERS/SRTIFDistributor/SRTIFDistributor.xml b/SRT/Outdated/CDB/MACI/Components/RECEIVERS/SRTIFDistributor/SRTIFDistributor.xml
similarity index 100%
rename from SRT/Configuration/CDB/MACI/Components/RECEIVERS/SRTIFDistributor/SRTIFDistributor.xml
rename to SRT/Outdated/CDB/MACI/Components/RECEIVERS/SRTIFDistributor/SRTIFDistributor.xml
diff --git a/SRT/Configuration/CDB/MACI/Components/RECEIVERS/SRTLPBandReceiver/SRTLPBandReceiver.xml b/SRT/Outdated/CDB/MACI/Components/RECEIVERS/SRTLPBandReceiver/SRTLPBandReceiver.xml
similarity index 100%
rename from SRT/Configuration/CDB/MACI/Components/RECEIVERS/SRTLPBandReceiver/SRTLPBandReceiver.xml
rename to SRT/Outdated/CDB/MACI/Components/RECEIVERS/SRTLPBandReceiver/SRTLPBandReceiver.xml
diff --git a/SRT/Configuration/CDB/MACI/Containers/HolographyContainer/HolographyContainer.xml b/SRT/Outdated/CDB/MACI/Containers/HolographyContainer/HolographyContainer.xml
similarity index 100%
rename from SRT/Configuration/CDB/MACI/Containers/HolographyContainer/HolographyContainer.xml
rename to SRT/Outdated/CDB/MACI/Containers/HolographyContainer/HolographyContainer.xml
diff --git a/SRT/Configuration/CDB/MACI/Containers/HolographyDXCContainer/HolographyDXCContainer.xml b/SRT/Outdated/CDB/MACI/Containers/HolographyDXCContainer/HolographyDXCContainer.xml
similarity index 100%
rename from SRT/Configuration/CDB/MACI/Containers/HolographyDXCContainer/HolographyDXCContainer.xml
rename to SRT/Outdated/CDB/MACI/Containers/HolographyDXCContainer/HolographyDXCContainer.xml
diff --git a/SRT/Configuration/CDB/MACI/Containers/LocalOscillatorLPContainer/LocalOscillatorLPContainer.xml b/SRT/Outdated/CDB/MACI/Containers/LocalOscillatorLPContainer/LocalOscillatorLPContainer.xml
similarity index 100%
rename from SRT/Configuration/CDB/MACI/Containers/LocalOscillatorLPContainer/LocalOscillatorLPContainer.xml
rename to SRT/Outdated/CDB/MACI/Containers/LocalOscillatorLPContainer/LocalOscillatorLPContainer.xml
diff --git a/SRT/Configuration/CDB/MACI/Containers/LocalOscillatorsContainer/LocalOscillatorsContainer.xml b/SRT/Outdated/CDB/MACI/Containers/LocalOscillatorsContainer/LocalOscillatorsContainer.xml
similarity index 100%
rename from SRT/Configuration/CDB/MACI/Containers/LocalOscillatorsContainer/LocalOscillatorsContainer.xml
rename to SRT/Outdated/CDB/MACI/Containers/LocalOscillatorsContainer/LocalOscillatorsContainer.xml
diff --git a/SRT/Configuration/CDB/MACI/Containers/NoiseGeneratorContainer/NoiseGeneratorContainer.xml b/SRT/Outdated/CDB/MACI/Containers/NoiseGeneratorContainer/NoiseGeneratorContainer.xml
similarity index 100%
rename from SRT/Configuration/CDB/MACI/Containers/NoiseGeneratorContainer/NoiseGeneratorContainer.xml
rename to SRT/Outdated/CDB/MACI/Containers/NoiseGeneratorContainer/NoiseGeneratorContainer.xml
diff --git a/SRT/Configuration/CDB/MACI/Containers/PyIFDistributorContainer/PyIFDistributorContainer.xml b/SRT/Outdated/CDB/MACI/Containers/PyIFDistributorContainer/PyIFDistributorContainer.xml
similarity index 100%
rename from SRT/Configuration/CDB/MACI/Containers/PyIFDistributorContainer/PyIFDistributorContainer.xml
rename to SRT/Outdated/CDB/MACI/Containers/PyIFDistributorContainer/PyIFDistributorContainer.xml
diff --git a/SRT/Configuration/CDB/MACI/Containers/SRTLPBandContainer/SRTLPBandContainer.xml b/SRT/Outdated/CDB/MACI/Containers/SRTLPBandContainer/SRTLPBandContainer.xml
similarity index 100%
rename from SRT/Configuration/CDB/MACI/Containers/SRTLPBandContainer/SRTLPBandContainer.xml
rename to SRT/Outdated/CDB/MACI/Containers/SRTLPBandContainer/SRTLPBandContainer.xml
diff --git a/SRT/Configuration/CDB/MACI/Containers/XContainer/XContainer.xml b/SRT/Outdated/CDB/MACI/Containers/XContainer/XContainer.xml
similarity index 100%
rename from SRT/Configuration/CDB/MACI/Containers/XContainer/XContainer.xml
rename to SRT/Outdated/CDB/MACI/Containers/XContainer/XContainer.xml
diff --git a/SRT/Outdated/CDB/alma/.gitignore b/SRT/Outdated/CDB/alma/.gitignore
new file mode 100644
index 000000000..f83a0eb46
--- /dev/null
+++ b/SRT/Outdated/CDB/alma/.gitignore
@@ -0,0 +1 @@
+# This file only exists here in order to prevent the directory from being ignored by git if empty
diff --git a/SRT/CDB/alma/ANTENNA/BossSimulator/BossSimulator.xml b/SRT/Outdated/CDB/alma/ANTENNA/BossSimulator/BossSimulator.xml
similarity index 100%
rename from SRT/CDB/alma/ANTENNA/BossSimulator/BossSimulator.xml
rename to SRT/Outdated/CDB/alma/ANTENNA/BossSimulator/BossSimulator.xml
diff --git a/SRT/Configuration/CDB/alma/BACKENDS/DXC2/DXC2.xml b/SRT/Outdated/CDB/alma/BACKENDS/DXC2/DXC2.xml
similarity index 100%
rename from SRT/Configuration/CDB/alma/BACKENDS/DXC2/DXC2.xml
rename to SRT/Outdated/CDB/alma/BACKENDS/DXC2/DXC2.xml
diff --git a/SRT/Configuration/CDB/alma/BACKENDS/Holography/Holography.xml b/SRT/Outdated/CDB/alma/BACKENDS/Holography/Holography.xml
similarity index 100%
rename from SRT/Configuration/CDB/alma/BACKENDS/Holography/Holography.xml
rename to SRT/Outdated/CDB/alma/BACKENDS/Holography/Holography.xml
diff --git a/SRT/CDB/alma/BACKENDS/NoiseGenerator/NoiseGenerator.xml b/SRT/Outdated/CDB/alma/BACKENDS/NoiseGenerator/NoiseGenerator.xml
similarity index 100%
rename from SRT/CDB/alma/BACKENDS/NoiseGenerator/NoiseGenerator.xml
rename to SRT/Outdated/CDB/alma/BACKENDS/NoiseGenerator/NoiseGenerator.xml
diff --git a/SRT/Configuration/CDB/alma/BACKENDS/XBackends/XBackends.xml b/SRT/Outdated/CDB/alma/BACKENDS/XBackends/XBackends.xml
similarity index 100%
rename from SRT/Configuration/CDB/alma/BACKENDS/XBackends/XBackends.xml
rename to SRT/Outdated/CDB/alma/BACKENDS/XBackends/XBackends.xml
diff --git a/SRT/Configuration/CDB/alma/DataBlock/MinorServo/PFP/LookupTables/LookupTables.xml b/SRT/Outdated/CDB/alma/DataBlock/MinorServo/PFP/LookupTables/LookupTables.xml
similarity index 100%
rename from SRT/Configuration/CDB/alma/DataBlock/MinorServo/PFP/LookupTables/LookupTables.xml
rename to SRT/Outdated/CDB/alma/DataBlock/MinorServo/PFP/LookupTables/LookupTables.xml
diff --git a/SRT/Configuration/CDB/alma/DataBlock/MinorServo/PFP/Properties/Properties.xml b/SRT/Outdated/CDB/alma/DataBlock/MinorServo/PFP/Properties/Properties.xml
similarity index 100%
rename from SRT/Configuration/CDB/alma/DataBlock/MinorServo/PFP/Properties/Properties.xml
rename to SRT/Outdated/CDB/alma/DataBlock/MinorServo/PFP/Properties/Properties.xml
diff --git a/SRT/CDB/alma/DataBlock/SRTIFDistributor/Configuration/Configuration.xml b/SRT/Outdated/CDB/alma/DataBlock/SRTIFDistributor/Configuration/Configuration.xml
similarity index 100%
rename from SRT/CDB/alma/DataBlock/SRTIFDistributor/Configuration/Configuration.xml
rename to SRT/Outdated/CDB/alma/DataBlock/SRTIFDistributor/Configuration/Configuration.xml
diff --git a/SRT/CDB/alma/DataBlock/SRTIFDistributor14/Mapping/Mapping.xml b/SRT/Outdated/CDB/alma/DataBlock/SRTIFDistributor14/Mapping/Mapping.xml
similarity index 100%
rename from SRT/CDB/alma/DataBlock/SRTIFDistributor14/Mapping/Mapping.xml
rename to SRT/Outdated/CDB/alma/DataBlock/SRTIFDistributor14/Mapping/Mapping.xml
diff --git a/SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Feeds/Feeds.xml b/SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Feeds/Feeds.xml
similarity index 100%
rename from SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Feeds/Feeds.xml
rename to SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Feeds/Feeds.xml
diff --git a/SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C1C1/C1C1.xml b/SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C1C1/C1C1.xml
similarity index 100%
rename from SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C1C1/C1C1.xml
rename to SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C1C1/C1C1.xml
diff --git a/SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C1C2/C1C2.xml b/SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C1C2/C1C2.xml
similarity index 100%
rename from SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C1C2/C1C2.xml
rename to SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C1C2/C1C2.xml
diff --git a/SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C1C3/C1C3.xml b/SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C1C3/C1C3.xml
similarity index 100%
rename from SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C1C3/C1C3.xml
rename to SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C1C3/C1C3.xml
diff --git a/SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C1C4/C1C4.xml b/SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C1C4/C1C4.xml
similarity index 100%
rename from SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C1C4/C1C4.xml
rename to SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C1C4/C1C4.xml
diff --git a/SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C1C5/C1C5.xml b/SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C1C5/C1C5.xml
similarity index 100%
rename from SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C1C5/C1C5.xml
rename to SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C1C5/C1C5.xml
diff --git a/SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C1L1/C1L1.xml b/SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C1L1/C1L1.xml
similarity index 100%
rename from SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C1L1/C1L1.xml
rename to SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C1L1/C1L1.xml
diff --git a/SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C1L2/C1L2.xml b/SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C1L2/C1L2.xml
similarity index 100%
rename from SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C1L2/C1L2.xml
rename to SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C1L2/C1L2.xml
diff --git a/SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C1L3/C1L3.xml b/SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C1L3/C1L3.xml
similarity index 100%
rename from SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C1L3/C1L3.xml
rename to SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C1L3/C1L3.xml
diff --git a/SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C1L4/C1L4.xml b/SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C1L4/C1L4.xml
similarity index 100%
rename from SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C1L4/C1L4.xml
rename to SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C1L4/C1L4.xml
diff --git a/SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C1L5/C1L5.xml b/SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C1L5/C1L5.xml
similarity index 100%
rename from SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C1L5/C1L5.xml
rename to SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C1L5/C1L5.xml
diff --git a/SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C1XX/C1XX.xml b/SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C1XX/C1XX.xml
similarity index 100%
rename from SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C1XX/C1XX.xml
rename to SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C1XX/C1XX.xml
diff --git a/SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C2C1/C2C1.xml b/SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C2C1/C2C1.xml
similarity index 100%
rename from SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C2C1/C2C1.xml
rename to SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C2C1/C2C1.xml
diff --git a/SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C2C2/C2C2.xml b/SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C2C2/C2C2.xml
similarity index 100%
rename from SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C2C2/C2C2.xml
rename to SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C2C2/C2C2.xml
diff --git a/SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C2C3/C2C3.xml b/SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C2C3/C2C3.xml
similarity index 100%
rename from SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C2C3/C2C3.xml
rename to SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C2C3/C2C3.xml
diff --git a/SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C2C4/C2C4.xml b/SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C2C4/C2C4.xml
similarity index 100%
rename from SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C2C4/C2C4.xml
rename to SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C2C4/C2C4.xml
diff --git a/SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C2C5/C2C5.xml b/SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C2C5/C2C5.xml
similarity index 100%
rename from SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C2C5/C2C5.xml
rename to SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C2C5/C2C5.xml
diff --git a/SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C2L1/C2L1.xml b/SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C2L1/C2L1.xml
similarity index 100%
rename from SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C2L1/C2L1.xml
rename to SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C2L1/C2L1.xml
diff --git a/SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C2L2/C2L2.xml b/SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C2L2/C2L2.xml
similarity index 100%
rename from SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C2L2/C2L2.xml
rename to SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C2L2/C2L2.xml
diff --git a/SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C2L3/C2L3.xml b/SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C2L3/C2L3.xml
similarity index 100%
rename from SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C2L3/C2L3.xml
rename to SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C2L3/C2L3.xml
diff --git a/SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C2L4/C2L4.xml b/SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C2L4/C2L4.xml
similarity index 100%
rename from SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C2L4/C2L4.xml
rename to SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C2L4/C2L4.xml
diff --git a/SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C2L5/C2L5.xml b/SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C2L5/C2L5.xml
similarity index 100%
rename from SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C2L5/C2L5.xml
rename to SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C2L5/C2L5.xml
diff --git a/SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C2XX/C2XX.xml b/SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C2XX/C2XX.xml
similarity index 100%
rename from SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C2XX/C2XX.xml
rename to SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C2XX/C2XX.xml
diff --git a/SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C3C1/C3C1.xml b/SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C3C1/C3C1.xml
similarity index 100%
rename from SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C3C1/C3C1.xml
rename to SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C3C1/C3C1.xml
diff --git a/SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C3C2/C3C2.xml b/SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C3C2/C3C2.xml
similarity index 100%
rename from SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C3C2/C3C2.xml
rename to SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C3C2/C3C2.xml
diff --git a/SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C3C3/C3C3.xml b/SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C3C3/C3C3.xml
similarity index 100%
rename from SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C3C3/C3C3.xml
rename to SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C3C3/C3C3.xml
diff --git a/SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C3C4/C3C4.xml b/SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C3C4/C3C4.xml
similarity index 100%
rename from SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C3C4/C3C4.xml
rename to SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C3C4/C3C4.xml
diff --git a/SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C3C5/C3C5.xml b/SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C3C5/C3C5.xml
similarity index 100%
rename from SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C3C5/C3C5.xml
rename to SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C3C5/C3C5.xml
diff --git a/SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C3L1/C3L1.xml b/SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C3L1/C3L1.xml
similarity index 100%
rename from SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C3L1/C3L1.xml
rename to SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C3L1/C3L1.xml
diff --git a/SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C3L2/C3L2.xml b/SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C3L2/C3L2.xml
similarity index 100%
rename from SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C3L2/C3L2.xml
rename to SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C3L2/C3L2.xml
diff --git a/SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C3L3/C3L3.xml b/SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C3L3/C3L3.xml
similarity index 100%
rename from SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C3L3/C3L3.xml
rename to SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C3L3/C3L3.xml
diff --git a/SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C3L4/C3L4.xml b/SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C3L4/C3L4.xml
similarity index 100%
rename from SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C3L4/C3L4.xml
rename to SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C3L4/C3L4.xml
diff --git a/SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C3L5/C3L5.xml b/SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C3L5/C3L5.xml
similarity index 100%
rename from SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C3L5/C3L5.xml
rename to SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C3L5/C3L5.xml
diff --git a/SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C3XX/C3XX.xml b/SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C3XX/C3XX.xml
similarity index 100%
rename from SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C3XX/C3XX.xml
rename to SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/C3XX/C3XX.xml
diff --git a/SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L1C1/L1C1.xml b/SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L1C1/L1C1.xml
similarity index 100%
rename from SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L1C1/L1C1.xml
rename to SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L1C1/L1C1.xml
diff --git a/SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L1C2/L1C2.xml b/SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L1C2/L1C2.xml
similarity index 100%
rename from SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L1C2/L1C2.xml
rename to SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L1C2/L1C2.xml
diff --git a/SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L1C3/L1C3.xml b/SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L1C3/L1C3.xml
similarity index 100%
rename from SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L1C3/L1C3.xml
rename to SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L1C3/L1C3.xml
diff --git a/SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L1C4/L1C4.xml b/SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L1C4/L1C4.xml
similarity index 100%
rename from SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L1C4/L1C4.xml
rename to SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L1C4/L1C4.xml
diff --git a/SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L1C5/L1C5.xml b/SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L1C5/L1C5.xml
similarity index 100%
rename from SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L1C5/L1C5.xml
rename to SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L1C5/L1C5.xml
diff --git a/SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L1L1/L1L1.xml b/SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L1L1/L1L1.xml
similarity index 100%
rename from SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L1L1/L1L1.xml
rename to SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L1L1/L1L1.xml
diff --git a/SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L1L2/L1L2.xml b/SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L1L2/L1L2.xml
similarity index 100%
rename from SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L1L2/L1L2.xml
rename to SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L1L2/L1L2.xml
diff --git a/SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L1L3/L1L3.xml b/SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L1L3/L1L3.xml
similarity index 100%
rename from SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L1L3/L1L3.xml
rename to SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L1L3/L1L3.xml
diff --git a/SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L1L4/L1L4.xml b/SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L1L4/L1L4.xml
similarity index 100%
rename from SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L1L4/L1L4.xml
rename to SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L1L4/L1L4.xml
diff --git a/SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L1L5/L1L5.xml b/SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L1L5/L1L5.xml
similarity index 100%
rename from SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L1L5/L1L5.xml
rename to SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L1L5/L1L5.xml
diff --git a/SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L1XX/L1XX.xml b/SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L1XX/L1XX.xml
similarity index 100%
rename from SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L1XX/L1XX.xml
rename to SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L1XX/L1XX.xml
diff --git a/SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L2C1/L2C1.xml b/SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L2C1/L2C1.xml
similarity index 100%
rename from SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L2C1/L2C1.xml
rename to SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L2C1/L2C1.xml
diff --git a/SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L2C2/L2C2.xml b/SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L2C2/L2C2.xml
similarity index 100%
rename from SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L2C2/L2C2.xml
rename to SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L2C2/L2C2.xml
diff --git a/SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L2C3/L2C3.xml b/SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L2C3/L2C3.xml
similarity index 100%
rename from SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L2C3/L2C3.xml
rename to SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L2C3/L2C3.xml
diff --git a/SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L2C4/L2C4.xml b/SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L2C4/L2C4.xml
similarity index 100%
rename from SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L2C4/L2C4.xml
rename to SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L2C4/L2C4.xml
diff --git a/SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L2C5/L2C5.xml b/SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L2C5/L2C5.xml
similarity index 100%
rename from SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L2C5/L2C5.xml
rename to SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L2C5/L2C5.xml
diff --git a/SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L2L1/L2L1.xml b/SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L2L1/L2L1.xml
similarity index 100%
rename from SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L2L1/L2L1.xml
rename to SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L2L1/L2L1.xml
diff --git a/SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L2L2/L2L2.xml b/SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L2L2/L2L2.xml
similarity index 100%
rename from SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L2L2/L2L2.xml
rename to SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L2L2/L2L2.xml
diff --git a/SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L2L3/L2L3.xml b/SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L2L3/L2L3.xml
similarity index 100%
rename from SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L2L3/L2L3.xml
rename to SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L2L3/L2L3.xml
diff --git a/SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L2L4/L2L4.xml b/SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L2L4/L2L4.xml
similarity index 100%
rename from SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L2L4/L2L4.xml
rename to SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L2L4/L2L4.xml
diff --git a/SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L2L5/L2L5.xml b/SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L2L5/L2L5.xml
similarity index 100%
rename from SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L2L5/L2L5.xml
rename to SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L2L5/L2L5.xml
diff --git a/SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L2XX/L2XX.xml b/SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L2XX/L2XX.xml
similarity index 100%
rename from SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L2XX/L2XX.xml
rename to SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L2XX/L2XX.xml
diff --git a/SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L3C1/L3C1.xml b/SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L3C1/L3C1.xml
similarity index 100%
rename from SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L3C1/L3C1.xml
rename to SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L3C1/L3C1.xml
diff --git a/SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L3C2/L3C2.xml b/SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L3C2/L3C2.xml
similarity index 100%
rename from SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L3C2/L3C2.xml
rename to SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L3C2/L3C2.xml
diff --git a/SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L3C3/L3C3.xml b/SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L3C3/L3C3.xml
similarity index 100%
rename from SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L3C3/L3C3.xml
rename to SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L3C3/L3C3.xml
diff --git a/SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L3C4/L3C4.xml b/SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L3C4/L3C4.xml
similarity index 100%
rename from SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L3C4/L3C4.xml
rename to SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L3C4/L3C4.xml
diff --git a/SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L3C5/L3C5.xml b/SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L3C5/L3C5.xml
similarity index 100%
rename from SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L3C5/L3C5.xml
rename to SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L3C5/L3C5.xml
diff --git a/SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L3L1/L3L1.xml b/SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L3L1/L3L1.xml
similarity index 100%
rename from SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L3L1/L3L1.xml
rename to SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L3L1/L3L1.xml
diff --git a/SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L3L2/L3L2.xml b/SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L3L2/L3L2.xml
similarity index 100%
rename from SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L3L2/L3L2.xml
rename to SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L3L2/L3L2.xml
diff --git a/SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L3L3/L3L3.xml b/SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L3L3/L3L3.xml
similarity index 100%
rename from SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L3L3/L3L3.xml
rename to SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L3L3/L3L3.xml
diff --git a/SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L3L4/L3L4.xml b/SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L3L4/L3L4.xml
similarity index 100%
rename from SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L3L4/L3L4.xml
rename to SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L3L4/L3L4.xml
diff --git a/SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L3L5/L3L5.xml b/SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L3L5/L3L5.xml
similarity index 100%
rename from SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L3L5/L3L5.xml
rename to SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L3L5/L3L5.xml
diff --git a/SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L3XX/L3XX.xml b/SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L3XX/L3XX.xml
similarity index 100%
rename from SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L3XX/L3XX.xml
rename to SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/L3XX/L3XX.xml
diff --git a/SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/SINGLEDISH/SINGLEDISH.xml b/SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/SINGLEDISH/SINGLEDISH.xml
similarity index 100%
rename from SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/SINGLEDISH/SINGLEDISH.xml
rename to SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/SINGLEDISH/SINGLEDISH.xml
diff --git a/SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/VLBI/VLBI.xml b/SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/VLBI/VLBI.xml
similarity index 100%
rename from SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/VLBI/VLBI.xml
rename to SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/VLBI/VLBI.xml
diff --git a/SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/XXC1/XXC1.xml b/SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/XXC1/XXC1.xml
similarity index 100%
rename from SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/XXC1/XXC1.xml
rename to SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/XXC1/XXC1.xml
diff --git a/SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/XXC2/XXC2.xml b/SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/XXC2/XXC2.xml
similarity index 100%
rename from SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/XXC2/XXC2.xml
rename to SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/XXC2/XXC2.xml
diff --git a/SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/XXC3/XXC3.xml b/SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/XXC3/XXC3.xml
similarity index 100%
rename from SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/XXC3/XXC3.xml
rename to SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/XXC3/XXC3.xml
diff --git a/SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/XXC4/XXC4.xml b/SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/XXC4/XXC4.xml
similarity index 100%
rename from SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/XXC4/XXC4.xml
rename to SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/XXC4/XXC4.xml
diff --git a/SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/XXC5/XXC5.xml b/SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/XXC5/XXC5.xml
similarity index 100%
rename from SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/XXC5/XXC5.xml
rename to SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/XXC5/XXC5.xml
diff --git a/SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/XXL1/XXL1.xml b/SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/XXL1/XXL1.xml
similarity index 100%
rename from SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/XXL1/XXL1.xml
rename to SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/XXL1/XXL1.xml
diff --git a/SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/XXL2/XXL2.xml b/SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/XXL2/XXL2.xml
similarity index 100%
rename from SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/XXL2/XXL2.xml
rename to SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/XXL2/XXL2.xml
diff --git a/SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/XXL3/XXL3.xml b/SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/XXL3/XXL3.xml
similarity index 100%
rename from SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/XXL3/XXL3.xml
rename to SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/XXL3/XXL3.xml
diff --git a/SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/XXL4/XXL4.xml b/SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/XXL4/XXL4.xml
similarity index 100%
rename from SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/XXL4/XXL4.xml
rename to SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/XXL4/XXL4.xml
diff --git a/SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/XXL5/XXL5.xml b/SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/XXL5/XXL5.xml
similarity index 100%
rename from SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/XXL5/XXL5.xml
rename to SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/XXL5/XXL5.xml
diff --git a/SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/make_modes.py b/SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/make_modes.py
similarity index 100%
rename from SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/make_modes.py
rename to SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Modes/make_modes.py
diff --git a/SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/NoiseMark/NoiseMark.xml b/SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/NoiseMark/NoiseMark.xml
similarity index 100%
rename from SRT/Configuration/CDB/alma/DataBlock/SRTLPBandReceiver/NoiseMark/NoiseMark.xml
rename to SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/NoiseMark/NoiseMark.xml
diff --git a/SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Synthesizer/Synthesizer.xml b/SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Synthesizer/Synthesizer.xml
similarity index 100%
rename from SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Synthesizer/Synthesizer.xml
rename to SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Synthesizer/Synthesizer.xml
diff --git a/SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Taper/Taper.xml b/SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Taper/Taper.xml
similarity index 100%
rename from SRT/CDB/alma/DataBlock/SRTLPBandReceiver/Taper/Taper.xml
rename to SRT/Outdated/CDB/alma/DataBlock/SRTLPBandReceiver/Taper/Taper.xml
diff --git a/SRT/Configuration/CDB/alma/DataBlock/SRTSBandMFReceiver/Feeds/Feeds.xml b/SRT/Outdated/CDB/alma/DataBlock/SRTSBandMFReceiver/Feeds/Feeds.xml
similarity index 100%
rename from SRT/Configuration/CDB/alma/DataBlock/SRTSBandMFReceiver/Feeds/Feeds.xml
rename to SRT/Outdated/CDB/alma/DataBlock/SRTSBandMFReceiver/Feeds/Feeds.xml
diff --git a/SRT/Configuration/CDB/alma/DataBlock/SRTSBandMFReceiver/MarkCoefficients/MarkCoefficients.xml b/SRT/Outdated/CDB/alma/DataBlock/SRTSBandMFReceiver/MarkCoefficients/MarkCoefficients.xml
similarity index 100%
rename from SRT/Configuration/CDB/alma/DataBlock/SRTSBandMFReceiver/MarkCoefficients/MarkCoefficients.xml
rename to SRT/Outdated/CDB/alma/DataBlock/SRTSBandMFReceiver/MarkCoefficients/MarkCoefficients.xml
diff --git a/SRT/Configuration/CDB/alma/DataBlock/SRTSBandMFReceiver/Modes/SINGLEDISH/SINGLEDISH.xml b/SRT/Outdated/CDB/alma/DataBlock/SRTSBandMFReceiver/Modes/SINGLEDISH/SINGLEDISH.xml
similarity index 100%
rename from SRT/Configuration/CDB/alma/DataBlock/SRTSBandMFReceiver/Modes/SINGLEDISH/SINGLEDISH.xml
rename to SRT/Outdated/CDB/alma/DataBlock/SRTSBandMFReceiver/Modes/SINGLEDISH/SINGLEDISH.xml
diff --git a/SRT/Configuration/CDB/alma/DataBlock/SRTSBandMFReceiver/Modes/VLBI/VLBI.xml b/SRT/Outdated/CDB/alma/DataBlock/SRTSBandMFReceiver/Modes/VLBI/VLBI.xml
similarity index 100%
rename from SRT/Configuration/CDB/alma/DataBlock/SRTSBandMFReceiver/Modes/VLBI/VLBI.xml
rename to SRT/Outdated/CDB/alma/DataBlock/SRTSBandMFReceiver/Modes/VLBI/VLBI.xml
diff --git a/SRT/Configuration/CDB/alma/DataBlock/SRTSBandMFReceiver/Synthesizer/Synthesizer.xml b/SRT/Outdated/CDB/alma/DataBlock/SRTSBandMFReceiver/Synthesizer/Synthesizer.xml
similarity index 100%
rename from SRT/Configuration/CDB/alma/DataBlock/SRTSBandMFReceiver/Synthesizer/Synthesizer.xml
rename to SRT/Outdated/CDB/alma/DataBlock/SRTSBandMFReceiver/Synthesizer/Synthesizer.xml
diff --git a/SRT/Configuration/CDB/alma/DataBlock/SRTSBandMFReceiver/Taper/Taper.xml b/SRT/Outdated/CDB/alma/DataBlock/SRTSBandMFReceiver/Taper/Taper.xml
similarity index 100%
rename from SRT/Configuration/CDB/alma/DataBlock/SRTSBandMFReceiver/Taper/Taper.xml
rename to SRT/Outdated/CDB/alma/DataBlock/SRTSBandMFReceiver/Taper/Taper.xml
diff --git a/SRT/Configuration/CDB/alma/RECEIVERS/LO1/LO1.xml b/SRT/Outdated/CDB/alma/RECEIVERS/LO1/LO1.xml
similarity index 100%
rename from SRT/Configuration/CDB/alma/RECEIVERS/LO1/LO1.xml
rename to SRT/Outdated/CDB/alma/RECEIVERS/LO1/LO1.xml
diff --git a/SRT/Configuration/CDB/alma/RECEIVERS/LO_LP/LO_LP.xml b/SRT/Outdated/CDB/alma/RECEIVERS/LO_LP/LO_LP.xml
similarity index 100%
rename from SRT/Configuration/CDB/alma/RECEIVERS/LO_LP/LO_LP.xml
rename to SRT/Outdated/CDB/alma/RECEIVERS/LO_LP/LO_LP.xml
diff --git a/SRT/CDB/alma/RECEIVERS/LO_SBAND/LO_SBAND.xml b/SRT/Outdated/CDB/alma/RECEIVERS/LO_SBAND/LO_SBAND.xml
similarity index 100%
rename from SRT/CDB/alma/RECEIVERS/LO_SBAND/LO_SBAND.xml
rename to SRT/Outdated/CDB/alma/RECEIVERS/LO_SBAND/LO_SBAND.xml
diff --git a/SRT/Configuration/CDB/alma/RECEIVERS/SRTIFDistributor/SRTIFDistributor.xml b/SRT/Outdated/CDB/alma/RECEIVERS/SRTIFDistributor/SRTIFDistributor.xml
similarity index 100%
rename from SRT/Configuration/CDB/alma/RECEIVERS/SRTIFDistributor/SRTIFDistributor.xml
rename to SRT/Outdated/CDB/alma/RECEIVERS/SRTIFDistributor/SRTIFDistributor.xml
diff --git a/SRT/CDB/alma/RECEIVERS/SRTIFDistributor14/SRTIFDistributor14.xml b/SRT/Outdated/CDB/alma/RECEIVERS/SRTIFDistributor14/SRTIFDistributor14.xml
similarity index 100%
rename from SRT/CDB/alma/RECEIVERS/SRTIFDistributor14/SRTIFDistributor14.xml
rename to SRT/Outdated/CDB/alma/RECEIVERS/SRTIFDistributor14/SRTIFDistributor14.xml
diff --git a/SRT/Configuration/CDB/alma/RECEIVERS/SRTLPBandReceiver/SRTLPBandReceiver.xml b/SRT/Outdated/CDB/alma/RECEIVERS/SRTLPBandReceiver/SRTLPBandReceiver.xml
similarity index 100%
rename from SRT/Configuration/CDB/alma/RECEIVERS/SRTLPBandReceiver/SRTLPBandReceiver.xml
rename to SRT/Outdated/CDB/alma/RECEIVERS/SRTLPBandReceiver/SRTLPBandReceiver.xml
diff --git a/SRT/CDB/alma/RECEIVERS/SRTSBandMFReceiver/SRTSBandMFReceiver.xml b/SRT/Outdated/CDB/alma/RECEIVERS/SRTSBandMFReceiver/SRTSBandMFReceiver.xml
similarity index 100%
rename from SRT/CDB/alma/RECEIVERS/SRTSBandMFReceiver/SRTSBandMFReceiver.xml
rename to SRT/Outdated/CDB/alma/RECEIVERS/SRTSBandMFReceiver/SRTSBandMFReceiver.xml
diff --git a/SRT/CDB/alma/TestNamespace/Positioner/Positioner.xml b/SRT/Outdated/CDB/alma/TestNamespace/Positioner/Positioner.xml
similarity index 100%
rename from SRT/CDB/alma/TestNamespace/Positioner/Positioner.xml
rename to SRT/Outdated/CDB/alma/TestNamespace/Positioner/Positioner.xml
diff --git a/SRT/CDB/alma/TestNamespace/Positioner00/Positioner00.xml b/SRT/Outdated/CDB/alma/TestNamespace/Positioner00/Positioner00.xml
similarity index 100%
rename from SRT/CDB/alma/TestNamespace/Positioner00/Positioner00.xml
rename to SRT/Outdated/CDB/alma/TestNamespace/Positioner00/Positioner00.xml
diff --git a/SRT/CDB/alma/TestNamespace/Positioner01/Positioner01.xml b/SRT/Outdated/CDB/alma/TestNamespace/Positioner01/Positioner01.xml
similarity index 100%
rename from SRT/CDB/alma/TestNamespace/Positioner01/Positioner01.xml
rename to SRT/Outdated/CDB/alma/TestNamespace/Positioner01/Positioner01.xml
diff --git a/SRT/CDB/alma/TestNamespace/Positioner02/Positioner02.xml b/SRT/Outdated/CDB/alma/TestNamespace/Positioner02/Positioner02.xml
similarity index 100%
rename from SRT/CDB/alma/TestNamespace/Positioner02/Positioner02.xml
rename to SRT/Outdated/CDB/alma/TestNamespace/Positioner02/Positioner02.xml
diff --git a/SRT/CDB/alma/TestNamespace/Positioner03/Positioner03.xml b/SRT/Outdated/CDB/alma/TestNamespace/Positioner03/Positioner03.xml
similarity index 100%
rename from SRT/CDB/alma/TestNamespace/Positioner03/Positioner03.xml
rename to SRT/Outdated/CDB/alma/TestNamespace/Positioner03/Positioner03.xml
-- 
GitLab