From ba44a06de823a3bc80e01fe45a558fc9c76fb622 Mon Sep 17 00:00:00 2001
From: Benjamin Renard <benjamin.renard@akka.eu>
Date: Wed, 6 Oct 2021 08:14:56 +0200
Subject: [PATCH] Move Person/*.xml into Person/CDPP-AMDA/*.xml

---
 Instrument/CDPP-AMDA/ACE/Ephemeris.xml                                | 2 +-
 Instrument/CDPP-AMDA/ACE/SWEPAM.xml                                   | 2 +-
 Instrument/CDPP-AMDA/ARTEMIS/P1/Models.xml                            | 2 +-
 Instrument/CDPP-AMDA/ARTEMIS/P2/Models.xml                            | 2 +-
 Instrument/CDPP-AMDA/Bepi/Ephemeris.xml                               | 2 +-
 Instrument/CDPP-AMDA/Bepi/MEA1.xml                                    | 4 ++--
 Instrument/CDPP-AMDA/Bepi/MEA2.xml                                    | 4 ++--
 Instrument/CDPP-AMDA/Bepi/MIA.xml                                     | 2 +-
 Instrument/CDPP-AMDA/Bepi/MPO-MAG.xml                                 | 4 ++--
 Instrument/CDPP-AMDA/Cassini/CAPS.xml                                 | 2 +-
 Instrument/CDPP-AMDA/Cassini/Ephemeris.xml                            | 2 +-
 Instrument/CDPP-AMDA/Cassini/MAG.xml                                  | 2 +-
 Instrument/CDPP-AMDA/Cassini/Moons_Ephemeris.xml                      | 2 +-
 Instrument/CDPP-AMDA/Cluster1/CIS-CODIF.xml                           | 2 +-
 Instrument/CDPP-AMDA/Cluster1/CIS-HIA.xml                             | 2 +-
 Instrument/CDPP-AMDA/Cluster1/EFW.xml                                 | 2 +-
 Instrument/CDPP-AMDA/Cluster1/Ephemeris.xml                           | 2 +-
 Instrument/CDPP-AMDA/Cluster1/Models.xml                              | 2 +-
 Instrument/CDPP-AMDA/Cluster1/WHISPER.xml                             | 2 +-
 Instrument/CDPP-AMDA/Cluster2/EFW.xml                                 | 2 +-
 Instrument/CDPP-AMDA/Cluster2/Ephemeris.xml                           | 2 +-
 Instrument/CDPP-AMDA/Cluster2/Models.xml                              | 2 +-
 Instrument/CDPP-AMDA/Cluster2/WHISPER.xml                             | 2 +-
 Instrument/CDPP-AMDA/Cluster3/CIS-CODIF.xml                           | 2 +-
 Instrument/CDPP-AMDA/Cluster3/CIS-HIA.xml                             | 2 +-
 Instrument/CDPP-AMDA/Cluster3/EFW.xml                                 | 2 +-
 Instrument/CDPP-AMDA/Cluster3/Ephemeris.xml                           | 2 +-
 Instrument/CDPP-AMDA/Cluster3/Models.xml                              | 2 +-
 Instrument/CDPP-AMDA/Cluster3/WHISPER.xml                             | 2 +-
 Instrument/CDPP-AMDA/Cluster4/CIS-CODIF.xml                           | 2 +-
 Instrument/CDPP-AMDA/Cluster4/EFW.xml                                 | 2 +-
 Instrument/CDPP-AMDA/Cluster4/Ephemeris.xml                           | 2 +-
 Instrument/CDPP-AMDA/Cluster4/Models.xml                              | 2 +-
 Instrument/CDPP-AMDA/Cluster4/WHISPER.xml                             | 2 +-
 Instrument/CDPP-AMDA/Comets.xml                                       | 2 +-
 Instrument/CDPP-AMDA/DSCOVR/Ephemeris.xml                             | 2 +-
 Instrument/CDPP-AMDA/DSCOVR/FC.xml                                    | 2 +-
 Instrument/CDPP-AMDA/DSCOVR/MAG.xml                                   | 2 +-
 Instrument/CDPP-AMDA/DoubleStar1/HIA.xml                              | 2 +-
 Instrument/CDPP-AMDA/EISCAT/32M.xml                                   | 4 ++--
 Instrument/CDPP-AMDA/EISCAT/42M.xml                                   | 4 ++--
 Instrument/CDPP-AMDA/EISCAT/UHF.xml                                   | 4 ++--
 Instrument/CDPP-AMDA/EISCAT/VHF.xml                                   | 4 ++--
 Instrument/CDPP-AMDA/Ephemerides.xml                                  | 2 +-
 Instrument/CDPP-AMDA/FERMI/LAT.xml                                    | 2 +-
 Instrument/CDPP-AMDA/Galileo/Models.xml                               | 2 +-
 Instrument/CDPP-AMDA/Galileo/ephemeris.xml                            | 2 +-
 Instrument/CDPP-AMDA/Geotail/EPIC.xml                                 | 4 ++--
 Instrument/CDPP-AMDA/Geotail/Models.xml                               | 2 +-
 Instrument/CDPP-AMDA/Helios1/AUX.xml                                  | 2 +-
 Instrument/CDPP-AMDA/Helios1/E1.xml                                   | 4 ++--
 Instrument/CDPP-AMDA/Helios1/E3.xml                                   | 2 +-
 Instrument/CDPP-AMDA/Helios1/Ephemeris.xml                            | 2 +-
 Instrument/CDPP-AMDA/Helios1/MAG.xml                                  | 6 +++---
 Instrument/CDPP-AMDA/Helios2/AUX.xml                                  | 2 +-
 Instrument/CDPP-AMDA/Helios2/E1.xml                                   | 4 ++--
 Instrument/CDPP-AMDA/Helios2/E3.xml                                   | 2 +-
 Instrument/CDPP-AMDA/Helios2/Ephemeris.xml                            | 2 +-
 Instrument/CDPP-AMDA/Helios2/MAG.xml                                  | 6 +++---
 Instrument/CDPP-AMDA/ISEE1/Ephemeris.xml                              | 3 +--
 Instrument/CDPP-AMDA/ISEE1/FVA.xml                                    | 2 +-
 Instrument/CDPP-AMDA/ISEE2/Ephemeris.xml                              | 3 +--
 Instrument/CDPP-AMDA/ISEE2/FVA.xml                                    | 2 +-
 Instrument/CDPP-AMDA/Interball-1/CORALL.xml                           | 2 +-
 Instrument/CDPP-AMDA/Interball-1/DOK2.xml                             | 4 ++--
 Instrument/CDPP-AMDA/Interball-1/Models.xml                           | 2 +-
 Instrument/CDPP-AMDA/Juice/Ephemeris.xml                              | 2 +-
 Instrument/CDPP-AMDA/Juice/Models.xml                                 | 2 +-
 Instrument/CDPP-AMDA/Juno/Ephemeris.xml                               | 4 ++--
 Instrument/CDPP-AMDA/Juno/FGM.xml                                     | 2 +-
 Instrument/CDPP-AMDA/Juno/JADE.xml                                    | 2 +-
 Instrument/CDPP-AMDA/Juno/JEDI.xml                                    | 2 +-
 Instrument/CDPP-AMDA/Juno/Models.xml                                  | 2 +-
 Instrument/CDPP-AMDA/MAVEN/EUV.xml                                    | 2 +-
 Instrument/CDPP-AMDA/MAVEN/Ephemeris.xml                              | 4 ++--
 Instrument/CDPP-AMDA/MAVEN/MAG.xml                                    | 2 +-
 Instrument/CDPP-AMDA/MAVEN/Models.xml                                 | 2 +-
 Instrument/CDPP-AMDA/MAVEN/SWEA.xml                                   | 2 +-
 Instrument/CDPP-AMDA/MAVEN/SWIA.xml                                   | 2 +-
 Instrument/CDPP-AMDA/MESSENGER/EPS.xml                                | 2 +-
 Instrument/CDPP-AMDA/MESSENGER/ephemeris.xml                          | 2 +-
 Instrument/CDPP-AMDA/MEX/ELS.xml                                      | 2 +-
 Instrument/CDPP-AMDA/MEX/Models.xml                                   | 2 +-
 Instrument/CDPP-AMDA/MEX/ephemeris.xml                                | 2 +-
 Instrument/CDPP-AMDA/MGS/Ephemeris.xml                                | 2 +-
 Instrument/CDPP-AMDA/MGS/Models.xml                                   | 2 +-
 Instrument/CDPP-AMDA/MGS/PROXY.xml                                    | 2 +-
 Instrument/CDPP-AMDA/MMS1/EDP.xml                                     | 6 +++---
 Instrument/CDPP-AMDA/MMS1/Ephemeris.xml                               | 4 ++--
 Instrument/CDPP-AMDA/MMS1/FGM.xml                                     | 4 ++--
 Instrument/CDPP-AMDA/MMS1/FPI.xml                                     | 4 ++--
 Instrument/CDPP-AMDA/MMS1/HPCA.xml                                    | 4 ++--
 Instrument/CDPP-AMDA/MMS1/Models.xml                                  | 2 +-
 Instrument/CDPP-AMDA/MMS1234/Ephemeris.xml                            | 4 ++--
 Instrument/CDPP-AMDA/MMS1234/FGM.xml                                  | 4 ++--
 Instrument/CDPP-AMDA/MMS2/EDP.xml                                     | 6 +++---
 Instrument/CDPP-AMDA/MMS2/Ephemeris.xml                               | 4 ++--
 Instrument/CDPP-AMDA/MMS2/FGM.xml                                     | 4 ++--
 Instrument/CDPP-AMDA/MMS2/FPI.xml                                     | 4 ++--
 Instrument/CDPP-AMDA/MMS2/HPCA.xml                                    | 4 ++--
 Instrument/CDPP-AMDA/MMS2/Models.xml                                  | 2 +-
 Instrument/CDPP-AMDA/MMS3/EDP.xml                                     | 6 +++---
 Instrument/CDPP-AMDA/MMS3/Ephemeris.xml                               | 4 ++--
 Instrument/CDPP-AMDA/MMS3/FGM.xml                                     | 4 ++--
 Instrument/CDPP-AMDA/MMS3/FPI.xml                                     | 4 ++--
 Instrument/CDPP-AMDA/MMS3/HPCA.xml                                    | 4 ++--
 Instrument/CDPP-AMDA/MMS3/Models.xml                                  | 2 +-
 Instrument/CDPP-AMDA/MMS4/EDP.xml                                     | 6 +++---
 Instrument/CDPP-AMDA/MMS4/Ephemeris.xml                               | 4 ++--
 Instrument/CDPP-AMDA/MMS4/FGM.xml                                     | 4 ++--
 Instrument/CDPP-AMDA/MMS4/FPI.xml                                     | 4 ++--
 Instrument/CDPP-AMDA/MMS4/HPCA.xml                                    | 4 ++--
 Instrument/CDPP-AMDA/MMS4/Models.xml                                  | 2 +-
 Instrument/CDPP-AMDA/Mariner10/Ephemeris.xml                          | 2 +-
 Instrument/CDPP-AMDA/Mariner10/Magnetometer.xml                       | 2 +-
 Instrument/CDPP-AMDA/Mariner10/PLS.xml                                | 4 ++--
 Instrument/CDPP-AMDA/POLAR/HYDRA.xml                                  | 2 +-
 Instrument/CDPP-AMDA/POLAR/Models.xml                                 | 2 +-
 Instrument/CDPP-AMDA/PSP/MAG.xml                                      | 2 +-
 Instrument/CDPP-AMDA/Phobos2/Ephemeris.xml                            | 2 +-
 Instrument/CDPP-AMDA/Rosetta/AUX.xml                                  | 2 +-
 Instrument/CDPP-AMDA/Rosetta/Ephemeris.xml                            | 2 +-
 Instrument/CDPP-AMDA/Rosetta/IES.xml                                  | 4 ++--
 Instrument/CDPP-AMDA/Rosetta/LAP.xml                                  | 2 +-
 Instrument/CDPP-AMDA/Rosetta/MIP.xml                                  | 2 +-
 Instrument/CDPP-AMDA/Rosetta/RSN.xml                                  | 2 +-
 Instrument/CDPP-AMDA/STEREO-A/Ephemeris.xml                           | 2 +-
 Instrument/CDPP-AMDA/STEREO-B/Ephemeris.xml                           | 2 +-
 Instrument/CDPP-AMDA/SWARM-A/Ephemeris.xml                            | 2 +-
 Instrument/CDPP-AMDA/SWARM-A/GNSS.xml                                 | 2 +-
 Instrument/CDPP-AMDA/SWARM-A/LP.xml                                   | 4 ++--
 Instrument/CDPP-AMDA/SWARM-A/MAG.xml                                  | 2 +-
 Instrument/CDPP-AMDA/SWARM-A/TII.xml                                  | 4 ++--
 Instrument/CDPP-AMDA/SWARM-B/Ephemeris.xml                            | 2 +-
 Instrument/CDPP-AMDA/SWARM-B/GNSS.xml                                 | 2 +-
 Instrument/CDPP-AMDA/SWARM-B/LP.xml                                   | 4 ++--
 Instrument/CDPP-AMDA/SWARM-B/MAG.xml                                  | 2 +-
 Instrument/CDPP-AMDA/SWARM-B/TII.xml                                  | 4 ++--
 Instrument/CDPP-AMDA/SWARM-C/Ephemeris.xml                            | 2 +-
 Instrument/CDPP-AMDA/SWARM-C/GNSS.xml                                 | 2 +-
 Instrument/CDPP-AMDA/SWARM-C/LP.xml                                   | 4 ++--
 Instrument/CDPP-AMDA/SWARM-C/MAG.xml                                  | 2 +-
 Instrument/CDPP-AMDA/SWARM-C/TII.xml                                  | 4 ++--
 Instrument/CDPP-AMDA/Solar_Orbiter/EPD-EPT.xml                        | 2 +-
 Instrument/CDPP-AMDA/Solar_Orbiter/EPD-HET.xml                        | 2 +-
 Instrument/CDPP-AMDA/Solar_Orbiter/EPD-SIS.xml                        | 2 +-
 Instrument/CDPP-AMDA/Solar_Orbiter/EPD-STEP.xml                       | 2 +-
 Instrument/CDPP-AMDA/Solar_Orbiter/Ephemeris.xml                      | 2 +-
 Instrument/CDPP-AMDA/Solar_Orbiter/MAG.xml                            | 2 +-
 Instrument/CDPP-AMDA/Solar_Orbiter/PAS.xml                            | 2 +-
 Instrument/CDPP-AMDA/THEMIS/A/Models.xml                              | 2 +-
 Instrument/CDPP-AMDA/THEMIS/B/Models.xml                              | 2 +-
 Instrument/CDPP-AMDA/THEMIS/C/Models.xml                              | 2 +-
 Instrument/CDPP-AMDA/THEMIS/D/Models.xml                              | 2 +-
 Instrument/CDPP-AMDA/THEMIS/E/Models.xml                              | 2 +-
 Instrument/CDPP-AMDA/TIMED/SEE.xml                                    | 2 +-
 Instrument/CDPP-AMDA/VEX/ELS.xml                                      | 2 +-
 Instrument/CDPP-AMDA/VEX/MAG.xml                                      | 2 +-
 Instrument/CDPP-AMDA/VEX/ephemeris.xml                                | 2 +-
 Instrument/CDPP-AMDA/Voyager1/Ephemeris.xml                           | 2 +-
 Instrument/CDPP-AMDA/Voyager2/Ephemeris.xml                           | 2 +-
 NumericalData/CDPP-AMDA/ACE/SWEPAM/ace-swe-all.xml                    | 2 +-
 NumericalData/CDPP-AMDA/ACE/SWEPAM/ace-swepam-real.xml                | 2 +-
 NumericalData/CDPP-AMDA/ACE/SWEPAM/ace-swepam-stea.xml                | 2 +-
 NumericalData/CDPP-AMDA/ACE/SWEPAM/ace-swp-all.xml                    | 2 +-
 NumericalData/CDPP-AMDA/Bepi/Ephemeris/bepi-cruise-all.xml            | 2 +-
 NumericalData/CDPP-AMDA/Bepi/Ephemeris/bepi-orb-earth.xml             | 2 +-
 NumericalData/CDPP-AMDA/Bepi/Ephemeris/bepi-orb-venus1.xml            | 2 +-
 NumericalData/CDPP-AMDA/Bepi/Ephemeris/bepi-orb-venus2.xml            | 2 +-
 NumericalData/CDPP-AMDA/Bepi/MEA1/bepi-mea1-3d.xml                    | 4 ++--
 NumericalData/CDPP-AMDA/Bepi/MEA1/bepi-mea1-omni16.xml                | 4 ++--
 NumericalData/CDPP-AMDA/Bepi/MEA1/bepi-mea1-pap.xml                   | 4 ++--
 NumericalData/CDPP-AMDA/Bepi/MEA1/bepi-mea1-pap0.xml                  | 4 ++--
 NumericalData/CDPP-AMDA/Bepi/MEA1/bepi-mea1-pap1.xml                  | 4 ++--
 NumericalData/CDPP-AMDA/Bepi/MEA1/bepi-mea1-pap2.xml                  | 4 ++--
 NumericalData/CDPP-AMDA/Bepi/MEA1/bepi-mea1-pap3.xml                  | 4 ++--
 NumericalData/CDPP-AMDA/Bepi/MEA1/bepi-mea1-vml.xml                   | 4 ++--
 NumericalData/CDPP-AMDA/Bepi/MEA1/bepi-mea1-vml0.xml                  | 4 ++--
 NumericalData/CDPP-AMDA/Bepi/MEA1/bepi-mea1-vml1.xml                  | 4 ++--
 NumericalData/CDPP-AMDA/Bepi/MEA1/bepi-mea1-vml2.xml                  | 4 ++--
 NumericalData/CDPP-AMDA/Bepi/MEA1/bepi-mea1-vml3.xml                  | 4 ++--
 NumericalData/CDPP-AMDA/Bepi/MEA1/bepi-mea1-vml4.xml                  | 4 ++--
 NumericalData/CDPP-AMDA/Bepi/MEA1/bepi-mea1-vml5.xml                  | 4 ++--
 NumericalData/CDPP-AMDA/Bepi/MEA2/bepi-mea2-omni16.xml                | 4 ++--
 NumericalData/CDPP-AMDA/Bepi/MEA2/bepi-mea2-pap.xml                   | 4 ++--
 NumericalData/CDPP-AMDA/Bepi/MEA2/bepi-mea2-pap0.xml                  | 4 ++--
 NumericalData/CDPP-AMDA/Bepi/MEA2/bepi-mea2-pap1.xml                  | 4 ++--
 NumericalData/CDPP-AMDA/Bepi/MEA2/bepi-mea2-pap2.xml                  | 4 ++--
 NumericalData/CDPP-AMDA/Bepi/MEA2/bepi-mea2-pap3.xml                  | 4 ++--
 NumericalData/CDPP-AMDA/Bepi/MEA2/bepi-mea2-vml.xml                   | 4 ++--
 NumericalData/CDPP-AMDA/Bepi/MEA2/bepi-mea2-vml0.xml                  | 4 ++--
 NumericalData/CDPP-AMDA/Bepi/MEA2/bepi-mea2-vml1.xml                  | 4 ++--
 NumericalData/CDPP-AMDA/Bepi/MEA2/bepi-mea2-vml2.xml                  | 4 ++--
 NumericalData/CDPP-AMDA/Bepi/MEA2/bepi-mea2-vml3.xml                  | 4 ++--
 NumericalData/CDPP-AMDA/Bepi/MEA2/bepi-mea2-vml4.xml                  | 4 ++--
 NumericalData/CDPP-AMDA/Bepi/MEA2/bepi-mea2-vml5.xml                  | 4 ++--
 NumericalData/CDPP-AMDA/Bepi/MIA/bepi-mia-earth.xml                   | 2 +-
 NumericalData/CDPP-AMDA/Bepi/MIA/bepi-mia-venus1.xml                  | 2 +-
 NumericalData/CDPP-AMDA/Bepi/MPO-MAG/bepi-mpo-earth.xml               | 4 ++--
 NumericalData/CDPP-AMDA/Cassini/CAPS/cass-caps-act.xml                | 2 +-
 NumericalData/CDPP-AMDA/Cassini/CAPS/cass-caps-elemo.xml              | 2 +-
 NumericalData/CDPP-AMDA/Cassini/CAPS/cass-caps-elssec.xml             | 2 +-
 NumericalData/CDPP-AMDA/Cassini/CAPS/cass-caps-fit.xml                | 2 +-
 NumericalData/CDPP-AMDA/Cassini/CAPS/cass-caps-ionmo.xml              | 2 +-
 NumericalData/CDPP-AMDA/Cassini/CAPS/cass-caps-scpot.xml              | 2 +-
 NumericalData/CDPP-AMDA/Cassini/CAPS/cass-caps-snghr.xml              | 2 +-
 NumericalData/CDPP-AMDA/Cassini/Ephemeris/cass-ephem-eqt.xml          | 2 +-
 NumericalData/CDPP-AMDA/Cassini/Ephemeris/cass-ephem-polar.xml        | 2 +-
 NumericalData/CDPP-AMDA/Cassini/Ephemeris/cass-ephem-sls3.xml         | 2 +-
 NumericalData/CDPP-AMDA/Cassini/Ephemeris/cass-orb-1s.xml             | 4 ++--
 NumericalData/CDPP-AMDA/Cassini/Ephemeris/cass-orb-60s.xml            | 4 ++--
 NumericalData/CDPP-AMDA/Cassini/Ephemeris/cass-orb-cruise.xml         | 4 ++--
 NumericalData/CDPP-AMDA/Cassini/Ephemeris/cass-orb-saturn.xml         | 4 ++--
 NumericalData/CDPP-AMDA/Cassini/Ephemeris/cass-sls4-north.xml         | 2 +-
 NumericalData/CDPP-AMDA/Cassini/Ephemeris/cass-sls4-south.xml         | 2 +-
 NumericalData/CDPP-AMDA/Cassini/MAG/Saturn_Orbit/cass-mag-krtphr.xml  | 4 ++--
 NumericalData/CDPP-AMDA/Cassini/MAG/Saturn_Orbit/cass-mag-orb1.xml    | 4 ++--
 NumericalData/CDPP-AMDA/Cassini/MAG/Saturn_Orbit/cass-mag-orb60.xml   | 4 ++--
 NumericalData/CDPP-AMDA/Cassini/MAG/cass-mag-jup.xml                  | 4 ++--
 NumericalData/CDPP-AMDA/Cassini/MAG/cass-mag-rtn1.xml                 | 4 ++--
 NumericalData/CDPP-AMDA/Cassini/MAG/cass-mag-rtn60.xml                | 4 ++--
 NumericalData/CDPP-AMDA/Cassini/MIMI-LEMMS/cass-lemms-acc1hour.xml    | 2 +-
 NumericalData/CDPP-AMDA/Cassini/MIMI-LEMMS/cass-lemms-acc1min.xml     | 2 +-
 NumericalData/CDPP-AMDA/Cassini/MIMI-LEMMS/cass-lemms-pha1hour.xml    | 2 +-
 NumericalData/CDPP-AMDA/Cassini/MIMI-LEMMS/cass-lemms-pha1min.xml     | 2 +-
 NumericalData/CDPP-AMDA/Cassini/Moons_Ephemeris/dione-ephem-polar.xml | 2 +-
 NumericalData/CDPP-AMDA/Cassini/Moons_Ephemeris/dione-orb-sls3.xml    | 2 +-
 NumericalData/CDPP-AMDA/Cassini/Moons_Ephemeris/encelad-ephem-pol.xml | 2 +-
 NumericalData/CDPP-AMDA/Cassini/Moons_Ephemeris/encelad-orb-sls3.xml  | 2 +-
 NumericalData/CDPP-AMDA/Cassini/Moons_Ephemeris/mimas-ephem-polar.xml | 2 +-
 NumericalData/CDPP-AMDA/Cassini/Moons_Ephemeris/mimas-orb-sls3.xml    | 2 +-
 NumericalData/CDPP-AMDA/Cassini/Moons_Ephemeris/rhea-ephem-polar.xml  | 2 +-
 NumericalData/CDPP-AMDA/Cassini/Moons_Ephemeris/rhea-orb-sls3.xml     | 2 +-
 NumericalData/CDPP-AMDA/Cassini/Moons_Ephemeris/tethys-ephem-pol.xml  | 2 +-
 NumericalData/CDPP-AMDA/Cassini/Moons_Ephemeris/tethys-orb-sls3.xml   | 2 +-
 NumericalData/CDPP-AMDA/Cassini/Moons_Ephemeris/titan-ephem-polar.xml | 2 +-
 NumericalData/CDPP-AMDA/Cassini/Moons_Ephemeris/titan-orb-sls3.xml    | 2 +-
 NumericalData/CDPP-AMDA/Cassini/RPWS/cass-fpe-earth.xml               | 2 +-
 NumericalData/CDPP-AMDA/Cassini/RPWS/cass-fpe-encel.xml               | 2 +-
 NumericalData/CDPP-AMDA/Cassini/RPWS/cass-fpe-jup.xml                 | 2 +-
 NumericalData/CDPP-AMDA/Cassini/RPWS/cass-fpe-sat.xml                 | 2 +-
 NumericalData/CDPP-AMDA/Cassini/RPWS/cass-lp-ni.xml                   | 2 +-
 NumericalData/CDPP-AMDA/Cassini/RPWS/cass-rpws-encelad.xml            | 2 +-
 NumericalData/CDPP-AMDA/Cassini/RPWS/cass-rpws-neproxy.xml            | 2 +-
 NumericalData/CDPP-AMDA/Cassini/RPWS/cass-rpws-qtn.xml                | 2 +-
 NumericalData/CDPP-AMDA/Cassini/RPWS/cass-rpws-saturn.xml             | 2 +-
 NumericalData/CDPP-AMDA/Cassini/RPWS/cass-rpws-skr.xml                | 4 ++--
 NumericalData/CDPP-AMDA/Cassini/RPWS/cass-rpws-titan.xml              | 2 +-
 NumericalData/CDPP-AMDA/Cassini/RPWS/cass-skr-phase.xml               | 2 +-
 NumericalData/CDPP-AMDA/Cluster/Cluster1/CIS-CODIF/clust1-cis-prp.xml | 2 +-
 NumericalData/CDPP-AMDA/Cluster/Cluster1/CIS-HIA/clust1-hia-mom.xml   | 2 +-
 NumericalData/CDPP-AMDA/Cluster/Cluster1/CIS-HIA/clust1-hia-pad.xml   | 2 +-
 NumericalData/CDPP-AMDA/Cluster/Cluster1/EFW/clust1-efw-gse.xml       | 2 +-
 NumericalData/CDPP-AMDA/Cluster/Cluster1/EFW/clust1-efw-ppp.xml       | 2 +-
 NumericalData/CDPP-AMDA/Cluster/Cluster1/EFW/clust1-efw-sr2.xml       | 2 +-
 NumericalData/CDPP-AMDA/Cluster/Cluster1/EFW/clust1-pot-full.xml      | 2 +-
 NumericalData/CDPP-AMDA/Cluster/Cluster1/EFW/clust1-pot-spin.xml      | 2 +-
 NumericalData/CDPP-AMDA/Cluster/Cluster1/Ephemeris/clust1-orb-all.xml | 2 +-
 NumericalData/CDPP-AMDA/Cluster/Cluster1/Models/c1-msph-models.xml    | 2 +-
 NumericalData/CDPP-AMDA/Cluster/Cluster1/Models/c1-t96-model.xml      | 2 +-
 NumericalData/CDPP-AMDA/Cluster/Cluster1/WHISPER/clust1-whi-pp.xml    | 2 +-
 NumericalData/CDPP-AMDA/Cluster/Cluster1/WHISPER/clust1-whi-whi.xml   | 2 +-
 NumericalData/CDPP-AMDA/Cluster/Cluster2/EFW/clust2-efw-gse.xml       | 2 +-
 NumericalData/CDPP-AMDA/Cluster/Cluster2/EFW/clust2-efw-ppp.xml       | 2 +-
 NumericalData/CDPP-AMDA/Cluster/Cluster2/EFW/clust2-efw-sr2.xml       | 2 +-
 NumericalData/CDPP-AMDA/Cluster/Cluster2/EFW/clust2-pot-full.xml      | 2 +-
 NumericalData/CDPP-AMDA/Cluster/Cluster2/EFW/clust2-pot-spin.xml      | 2 +-
 NumericalData/CDPP-AMDA/Cluster/Cluster2/Ephemeris/clust2-orb-all.xml | 2 +-
 NumericalData/CDPP-AMDA/Cluster/Cluster2/Models/c2-msph-models.xml    | 2 +-
 NumericalData/CDPP-AMDA/Cluster/Cluster2/Models/c2-t96-model.xml      | 2 +-
 NumericalData/CDPP-AMDA/Cluster/Cluster2/WHISPER/clust2-whi-pp.xml    | 2 +-
 NumericalData/CDPP-AMDA/Cluster/Cluster2/WHISPER/clust2-whi-whi.xml   | 2 +-
 NumericalData/CDPP-AMDA/Cluster/Cluster3/CIS-CODIF/clust3-cis-prp.xml | 2 +-
 NumericalData/CDPP-AMDA/Cluster/Cluster3/CIS-HIA/clust3-hia-mom.xml   | 2 +-
 NumericalData/CDPP-AMDA/Cluster/Cluster3/CIS-HIA/clust3-hia-pad.xml   | 2 +-
 NumericalData/CDPP-AMDA/Cluster/Cluster3/EFW/clust3-efw-gse.xml       | 2 +-
 NumericalData/CDPP-AMDA/Cluster/Cluster3/EFW/clust3-efw-sr2.xml       | 2 +-
 NumericalData/CDPP-AMDA/Cluster/Cluster3/EFW/clust3-pot-full.xml      | 2 +-
 NumericalData/CDPP-AMDA/Cluster/Cluster3/EFW/clust3-pot-spin.xml      | 2 +-
 NumericalData/CDPP-AMDA/Cluster/Cluster3/Ephemeris/clust3-orb-all.xml | 2 +-
 NumericalData/CDPP-AMDA/Cluster/Cluster3/Models/c3-msph-models.xml    | 2 +-
 NumericalData/CDPP-AMDA/Cluster/Cluster3/Models/c3-t96-model.xml      | 2 +-
 NumericalData/CDPP-AMDA/Cluster/Cluster3/WHISPER/clust3-whi-pp.xml    | 2 +-
 NumericalData/CDPP-AMDA/Cluster/Cluster3/WHISPER/clust3-whi-whi.xml   | 2 +-
 NumericalData/CDPP-AMDA/Cluster/Cluster4/CIS-CODIF/clust4-cis-prp.xml | 2 +-
 NumericalData/CDPP-AMDA/Cluster/Cluster4/EFW/clust4-efw-gse.xml       | 2 +-
 NumericalData/CDPP-AMDA/Cluster/Cluster4/EFW/clust4-efw-ppp.xml       | 2 +-
 NumericalData/CDPP-AMDA/Cluster/Cluster4/EFW/clust4-pot-full.xml      | 2 +-
 NumericalData/CDPP-AMDA/Cluster/Cluster4/EFW/clust4-pot-spin.xml      | 2 +-
 NumericalData/CDPP-AMDA/Cluster/Cluster4/Ephemeris/clust4-orb-all.xml | 2 +-
 NumericalData/CDPP-AMDA/Cluster/Cluster4/Models/c4-msph-models.xml    | 2 +-
 NumericalData/CDPP-AMDA/Cluster/Cluster4/Models/c4-t96-model.xml      | 2 +-
 NumericalData/CDPP-AMDA/Cluster/Cluster4/WHISPER/clust4-whi-pp.xml    | 2 +-
 NumericalData/CDPP-AMDA/Cluster/Cluster4/WHISPER/clust4-whi-whi.xml   | 2 +-
 NumericalData/CDPP-AMDA/DSCOVR/Ephemeris/dsc-orb-all.xml              | 2 +-
 NumericalData/CDPP-AMDA/DSCOVR/FC/dsc-fc-1m.xml                       | 4 ++--
 NumericalData/CDPP-AMDA/DSCOVR/FC/dsc-fc-3s.xml                       | 4 ++--
 NumericalData/CDPP-AMDA/DSCOVR/MAG/dsc-mag-1m.xml                     | 2 +-
 NumericalData/CDPP-AMDA/DSCOVR/MAG/dsc-mag-1s.xml                     | 2 +-
 NumericalData/CDPP-AMDA/DoubleStar1/HIA/dstar1-hia-prp.xml            | 2 +-
 NumericalData/CDPP-AMDA/Ephemerides/amalthea-orb-all.xml              | 2 +-
 NumericalData/CDPP-AMDA/Ephemerides/callisto-orb-all.xml              | 2 +-
 NumericalData/CDPP-AMDA/Ephemerides/dione-orb-all.xml                 | 2 +-
 NumericalData/CDPP-AMDA/Ephemerides/earth-orb-all.xml                 | 2 +-
 NumericalData/CDPP-AMDA/Ephemerides/enceladus-orb-all.xml             | 2 +-
 NumericalData/CDPP-AMDA/Ephemerides/europa-orb-all.xml                | 2 +-
 NumericalData/CDPP-AMDA/Ephemerides/ganymede-orb-all.xml              | 2 +-
 NumericalData/CDPP-AMDA/Ephemerides/io-orb-all.xml                    | 2 +-
 NumericalData/CDPP-AMDA/Ephemerides/jupiter-orb-all.xml               | 2 +-
 NumericalData/CDPP-AMDA/Ephemerides/mars-moons-orb.xml                | 2 +-
 NumericalData/CDPP-AMDA/Ephemerides/mars-orb-all.xml                  | 2 +-
 NumericalData/CDPP-AMDA/Ephemerides/mercury-orb-all.xml               | 2 +-
 NumericalData/CDPP-AMDA/Ephemerides/mimas-orb-all.xml                 | 2 +-
 NumericalData/CDPP-AMDA/Ephemerides/moon-earth-all.xml                | 2 +-
 NumericalData/CDPP-AMDA/Ephemerides/neptune-orb-all.xml               | 2 +-
 NumericalData/CDPP-AMDA/Ephemerides/p67-orb-all.xml                   | 2 +-
 NumericalData/CDPP-AMDA/Ephemerides/pluto-orb-all.xml                 | 2 +-
 NumericalData/CDPP-AMDA/Ephemerides/rhea-orb-all.xml                  | 2 +-
 NumericalData/CDPP-AMDA/Ephemerides/saturn-orb-all.xml                | 2 +-
 NumericalData/CDPP-AMDA/Ephemerides/tethys-orb-all.xml                | 2 +-
 NumericalData/CDPP-AMDA/Ephemerides/titan-orb-all.xml                 | 2 +-
 NumericalData/CDPP-AMDA/Ephemerides/uranus-orb-all.xml                | 2 +-
 NumericalData/CDPP-AMDA/Ephemerides/venus-orb-all.xml                 | 2 +-
 NumericalData/CDPP-AMDA/FERMI/LAT/fermi-lat-lc.xml                    | 2 +-
 NumericalData/CDPP-AMDA/FREJA/ESP/fja-sc-charg.xml                    | 2 +-
 NumericalData/CDPP-AMDA/GEOTAIL/EPIC/gtl-epic-e.xml                   | 6 +++---
 NumericalData/CDPP-AMDA/GEOTAIL/EPIC/gtl-epic-ed.xml                  | 6 +++---
 NumericalData/CDPP-AMDA/GEOTAIL/EPIC/gtl-epic-ehigh.xml               | 6 +++---
 NumericalData/CDPP-AMDA/GEOTAIL/EPIC/gtl-epic-he.xml                  | 6 +++---
 NumericalData/CDPP-AMDA/GEOTAIL/EPIC/gtl-epic-hehigh.xml              | 6 +++---
 NumericalData/CDPP-AMDA/GEOTAIL/EPIC/gtl-epic-hr0.xml                 | 6 +++---
 NumericalData/CDPP-AMDA/GEOTAIL/EPIC/gtl-epic-m.xml                   | 6 +++---
 NumericalData/CDPP-AMDA/GEOTAIL/EPIC/gtl-epic-mhigh.xml               | 6 +++---
 NumericalData/CDPP-AMDA/GEOTAIL/EPIC/gtl-epic-p.xml                   | 6 +++---
 NumericalData/CDPP-AMDA/GEOTAIL/EPIC/gtl-epic-phigh.xml               | 6 +++---
 NumericalData/CDPP-AMDA/GEOTAIL/Models/gtl-msph-models.xml            | 2 +-
 NumericalData/CDPP-AMDA/GEOTAIL/Models/gtl-t96-model.xml              | 2 +-
 NumericalData/CDPP-AMDA/Galileo/EPD/gll-epd-amalele.xml               | 8 ++++----
 NumericalData/CDPP-AMDA/Galileo/EPD/gll-epd-amalion.xml               | 8 ++++----
 NumericalData/CDPP-AMDA/Galileo/EPD/gll-epd-callele.xml               | 8 ++++----
 NumericalData/CDPP-AMDA/Galileo/EPD/gll-epd-callion.xml               | 8 ++++----
 NumericalData/CDPP-AMDA/Galileo/EPD/gll-epd-ert.xml                   | 8 ++++----
 NumericalData/CDPP-AMDA/Galileo/EPD/gll-epd-euroele.xml               | 8 ++++----
 NumericalData/CDPP-AMDA/Galileo/EPD/gll-epd-euroion.xml               | 8 ++++----
 NumericalData/CDPP-AMDA/Galileo/EPD/gll-epd-ganyele.xml               | 8 ++++----
 NumericalData/CDPP-AMDA/Galileo/EPD/gll-epd-ganyion.xml               | 8 ++++----
 NumericalData/CDPP-AMDA/Galileo/EPD/gll-epd-ioele.xml                 | 8 ++++----
 NumericalData/CDPP-AMDA/Galileo/EPD/gll-epd-ioion.xml                 | 8 ++++----
 NumericalData/CDPP-AMDA/Galileo/EPD/gll-epd-rt.xml                    | 8 ++++----
 NumericalData/CDPP-AMDA/Galileo/EPD/gll-epd-survele.xml               | 8 ++++----
 NumericalData/CDPP-AMDA/Galileo/EPD/gll-epd-survion.xml               | 8 ++++----
 NumericalData/CDPP-AMDA/Galileo/MAG/gll-mag-burst.xml                 | 2 +-
 NumericalData/CDPP-AMDA/Galileo/MAG/gll-mag-ca.xml                    | 2 +-
 NumericalData/CDPP-AMDA/Galileo/MAG/gll-mag-eu.xml                    | 2 +-
 NumericalData/CDPP-AMDA/Galileo/MAG/gll-mag-ga.xml                    | 2 +-
 NumericalData/CDPP-AMDA/Galileo/MAG/gll-mag-io.xml                    | 2 +-
 NumericalData/CDPP-AMDA/Galileo/MAG/gll-mag-msreal.xml                | 2 +-
 NumericalData/CDPP-AMDA/Galileo/Models/gll-mod-khurana.xml            | 2 +-
 NumericalData/CDPP-AMDA/Galileo/Models/gll-mod-onera.xml              | 2 +-
 NumericalData/CDPP-AMDA/Galileo/Moons_Ephemeris/cal-eph-pol.xml       | 2 +-
 NumericalData/CDPP-AMDA/Galileo/Moons_Ephemeris/eur-eph-pol.xml       | 2 +-
 NumericalData/CDPP-AMDA/Galileo/Moons_Ephemeris/gan-eph-pol.xml       | 2 +-
 NumericalData/CDPP-AMDA/Galileo/Moons_Ephemeris/io-eph-pol.xml        | 2 +-
 NumericalData/CDPP-AMDA/Galileo/PLS/gll-pls-fit.xml                   | 2 +-
 NumericalData/CDPP-AMDA/Galileo/PLS/gll-pls-mom.xml                   | 2 +-
 NumericalData/CDPP-AMDA/Galileo/ephemeris/gll-eph-pol.xml             | 2 +-
 NumericalData/CDPP-AMDA/Galileo/ephemeris/gll-orb-burst.xml           | 2 +-
 NumericalData/CDPP-AMDA/Galileo/ephemeris/gll-orb-ca.xml              | 2 +-
 NumericalData/CDPP-AMDA/Galileo/ephemeris/gll-orb-eu.xml              | 2 +-
 NumericalData/CDPP-AMDA/Galileo/ephemeris/gll-orb-ga.xml              | 2 +-
 NumericalData/CDPP-AMDA/Galileo/ephemeris/gll-orb-io.xml              | 2 +-
 NumericalData/CDPP-AMDA/Galileo/ephemeris/gll-orbit-jup.xml           | 4 ++--
 NumericalData/CDPP-AMDA/Helios1/AUX/helios1-aux-corefit.xml           | 2 +-
 NumericalData/CDPP-AMDA/Helios1/E1/helios1-e1-all.xml                 | 2 +-
 NumericalData/CDPP-AMDA/Helios1/E3/helios1-e3-all.xml                 | 2 +-
 NumericalData/CDPP-AMDA/Helios1/MAG/helios1-mag-corefit.xml           | 2 +-
 NumericalData/CDPP-AMDA/Helios1/ephemeris/helios1-orb-all.xml         | 4 ++--
 NumericalData/CDPP-AMDA/Helios2/AUX/helios2-aux-corefit.xml           | 2 +-
 NumericalData/CDPP-AMDA/Helios2/E1/helios2-e1-all.xml                 | 2 +-
 NumericalData/CDPP-AMDA/Helios2/E3/helios2-e3-all.xml                 | 2 +-
 NumericalData/CDPP-AMDA/Helios2/MAG/helios2-mag-corefit.xml           | 2 +-
 NumericalData/CDPP-AMDA/Helios2/ephemeris/helios2-orb-all.xml         | 4 ++--
 NumericalData/CDPP-AMDA/INTERBALL-Tail/CORALL/intt-crl-kp.xml         | 2 +-
 NumericalData/CDPP-AMDA/INTERBALL-Tail/DOK2/iball-dok-1s.xml          | 4 ++--
 NumericalData/CDPP-AMDA/INTERBALL-Tail/DOK2/iball-dok-1t.xml          | 4 ++--
 NumericalData/CDPP-AMDA/INTERBALL-Tail/DOK2/iball-dok-2s.xml          | 4 ++--
 NumericalData/CDPP-AMDA/INTERBALL-Tail/DOK2/iball-dok-2t.xml          | 4 ++--
 NumericalData/CDPP-AMDA/INTERBALL-Tail/DOK2/iball-dok-3s.xml          | 4 ++--
 NumericalData/CDPP-AMDA/INTERBALL-Tail/DOK2/iball-dok-3t.xml          | 4 ++--
 NumericalData/CDPP-AMDA/INTERBALL-Tail/DOK2/iball-dok-4s.xml          | 4 ++--
 NumericalData/CDPP-AMDA/INTERBALL-Tail/DOK2/iball-dok-4t.xml          | 4 ++--
 NumericalData/CDPP-AMDA/INTERBALL-Tail/Models/it-msph-models.xml      | 2 +-
 NumericalData/CDPP-AMDA/INTERBALL-Tail/Models/it-t96-model.xml        | 2 +-
 NumericalData/CDPP-AMDA/ISEE/ISEE1/FVA/isee1-fva-all.xml              | 2 +-
 NumericalData/CDPP-AMDA/ISEE/ISEE2/FVA/isee2-fva-all.xml              | 2 +-
 NumericalData/CDPP-AMDA/Indices/Ground_Based/ground-based-aa.xml      | 2 +-
 NumericalData/CDPP-AMDA/Indices/Ground_Based/ground-based-aei.xml     | 4 ++--
 NumericalData/CDPP-AMDA/Indices/Ground_Based/ground-based-am.xml      | 2 +-
 NumericalData/CDPP-AMDA/Indices/Ground_Based/ground-based-asy.xml     | 4 ++--
 NumericalData/CDPP-AMDA/Indices/Ground_Based/ground-based-dst.xml     | 4 ++--
 NumericalData/CDPP-AMDA/Juice/Ephemeris/juice-callisto-cr30.xml       | 2 +-
 NumericalData/CDPP-AMDA/Juice/Ephemeris/juice-callisto-cr32.xml       | 2 +-
 NumericalData/CDPP-AMDA/Juice/Ephemeris/juice-callisto-cr41.xml       | 2 +-
 NumericalData/CDPP-AMDA/Juice/Ephemeris/juice-cruise-cr30.xml         | 2 +-
 NumericalData/CDPP-AMDA/Juice/Ephemeris/juice-cruise-cr32.xml         | 2 +-
 NumericalData/CDPP-AMDA/Juice/Ephemeris/juice-cruise-cr41.xml         | 2 +-
 NumericalData/CDPP-AMDA/Juice/Ephemeris/juice-europa-cr30.xml         | 2 +-
 NumericalData/CDPP-AMDA/Juice/Ephemeris/juice-europa-cr32.xml         | 2 +-
 NumericalData/CDPP-AMDA/Juice/Ephemeris/juice-europa-cr41.xml         | 2 +-
 NumericalData/CDPP-AMDA/Juice/Ephemeris/juice-ganymede-cr30.xml       | 2 +-
 NumericalData/CDPP-AMDA/Juice/Ephemeris/juice-ganymede-cr32.xml       | 2 +-
 NumericalData/CDPP-AMDA/Juice/Ephemeris/juice-ganymede-cr41.xml       | 2 +-
 NumericalData/CDPP-AMDA/Juice/Ephemeris/juice-jup-cr30.xml            | 2 +-
 NumericalData/CDPP-AMDA/Juice/Ephemeris/juice-jup-cr32.xml            | 2 +-
 NumericalData/CDPP-AMDA/Juice/Ephemeris/juice-jup-cr41.xml            | 2 +-
 NumericalData/CDPP-AMDA/Juice/Models/juice30-jrm09-model.xml          | 4 ++--
 NumericalData/CDPP-AMDA/Juice/Models/juice32-jrm09-model.xml          | 4 ++--
 NumericalData/CDPP-AMDA/Juice/Models/juice41-jrm09-model.xml          | 4 ++--
 NumericalData/CDPP-AMDA/Juno/Ephemeris/juno-cruise-all.xml            | 2 +-
 NumericalData/CDPP-AMDA/Juno/Ephemeris/juno-jupiter-all.xml           | 4 ++--
 NumericalData/CDPP-AMDA/Juno/FGM/juno-fgm-cruise60.xml                | 4 ++--
 NumericalData/CDPP-AMDA/Juno/FGM/juno-fgm-orb1.xml                    | 4 ++--
 NumericalData/CDPP-AMDA/Juno/FGM/juno-fgm-orb60.xml                   | 4 ++--
 NumericalData/CDPP-AMDA/Juno/FGM/juno-fgm-orbfull.xml                 | 4 ++--
 NumericalData/CDPP-AMDA/Juno/Models/jun-jrm09-model.xml               | 4 ++--
 NumericalData/CDPP-AMDA/MAVEN/EUV/mvn-euv-clb.xml                     | 2 +-
 NumericalData/CDPP-AMDA/MAVEN/EUV/mvn-euv-mod.xml                     | 2 +-
 NumericalData/CDPP-AMDA/MAVEN/Ephemeris/maven-orb-cruise.xml          | 4 ++--
 NumericalData/CDPP-AMDA/MAVEN/Ephemeris/maven-orb-marsobs.xml         | 4 ++--
 NumericalData/CDPP-AMDA/MAVEN/LPW/mav-lpw-kp.xml                      | 4 ++--
 NumericalData/CDPP-AMDA/MAVEN/LPW/mvn-lpw-scpot.xml                   | 2 +-
 NumericalData/CDPP-AMDA/MAVEN/LPW/mvn-lpw-wn.xml                      | 2 +-
 NumericalData/CDPP-AMDA/MAVEN/MAG/mav-mag-all.xml                     | 2 +-
 NumericalData/CDPP-AMDA/MAVEN/MAG/mav-mag-kp.xml                      | 4 ++--
 NumericalData/CDPP-AMDA/MAVEN/Models/mav-morsch-model.xml             | 4 ++--
 NumericalData/CDPP-AMDA/MAVEN/NGIMS/mav-ngims-kp.xml                  | 2 +-
 NumericalData/CDPP-AMDA/MAVEN/STATIC/mav-static-kp.xml                | 2 +-
 NumericalData/CDPP-AMDA/MAVEN/SWEA/mav-swea-kp.xml                    | 4 ++--
 NumericalData/CDPP-AMDA/MAVEN/SWEA/mavpds-swea-svyspec.xml            | 2 +-
 NumericalData/CDPP-AMDA/MAVEN/SWIA/mav-swia-kp.xml                    | 4 ++--
 NumericalData/CDPP-AMDA/MAVEN/SWIA/mavpds-swia-momboard.xml           | 2 +-
 NumericalData/CDPP-AMDA/MAVEN/SWIA/mavpds-swia-specboard.xml          | 2 +-
 NumericalData/CDPP-AMDA/MESSENGER/EPS/mess-eps-pa.xml                 | 2 +-
 NumericalData/CDPP-AMDA/MESSENGER/EPS/mess-eps-spec.xml               | 2 +-
 NumericalData/CDPP-AMDA/MESSENGER/FIPS/mes-fips-scan.xml              | 2 +-
 NumericalData/CDPP-AMDA/MESSENGER/FIPS/mess-fips-espec.xml            | 2 +-
 NumericalData/CDPP-AMDA/MESSENGER/FIPS/mess-fips-nobs.xml             | 2 +-
 NumericalData/CDPP-AMDA/MESSENGER/FIPS/mess-fips-ntp.xml              | 2 +-
 NumericalData/CDPP-AMDA/MESSENGER/ephemeris/mes-orb-orb.xml           | 4 ++--
 NumericalData/CDPP-AMDA/MEX/ELS/mex-els-all.xml                       | 4 ++--
 NumericalData/CDPP-AMDA/MEX/IMA/mex-ima-bg.xml                        | 2 +-
 NumericalData/CDPP-AMDA/MEX/IMA/mex-ima-extra.xml                     | 4 ++--
 NumericalData/CDPP-AMDA/MEX/IMA/mex-ima-param.xml                     | 4 ++--
 NumericalData/CDPP-AMDA/MEX/IMA/mex-ima-sw.xml                        | 4 ++--
 NumericalData/CDPP-AMDA/MEX/MARSIS/mex-marsis-ele.xml                 | 4 ++--
 NumericalData/CDPP-AMDA/MEX/Models/mex-morsch-model.xml               | 4 ++--
 NumericalData/CDPP-AMDA/MEX/ephemeris/mex-orb-mars.xml                | 2 +-
 NumericalData/CDPP-AMDA/MGS/ER/mgs-er-omni.xml                        | 2 +-
 NumericalData/CDPP-AMDA/MGS/Ephemeris/mgs-orb-all.xml                 | 4 ++--
 NumericalData/CDPP-AMDA/MGS/MAG/mgs-mag-mso.xml                       | 2 +-
 NumericalData/CDPP-AMDA/MGS/Models/mgs-morsch-model.xml               | 4 ++--
 NumericalData/CDPP-AMDA/MGS/Proxy/mgs-proxy-drap.xml                  | 2 +-
 NumericalData/CDPP-AMDA/MGS/Proxy/mgs-proxy-euv.xml                   | 2 +-
 NumericalData/CDPP-AMDA/MGS/Proxy/mgs-proxy-subsol.xml                | 2 +-
 NumericalData/CDPP-AMDA/MMS/MMS1/EDP/mms1-dce-brst.xml                | 6 +++---
 NumericalData/CDPP-AMDA/MMS/MMS1/EDP/mms1-edp-dce.xml                 | 6 +++---
 NumericalData/CDPP-AMDA/MMS/MMS1/EDP/mms1-edp-hfesp.xml               | 6 +++---
 NumericalData/CDPP-AMDA/MMS/MMS1/EDP/mms1-edp-scpot.xml               | 6 +++---
 NumericalData/CDPP-AMDA/MMS/MMS1/Ephemeris/mms1-orb-t89d.xml          | 4 ++--
 NumericalData/CDPP-AMDA/MMS/MMS1/FGM/mms1-fgm-brst.xml                | 4 ++--
 NumericalData/CDPP-AMDA/MMS/MMS1/FGM/mms1-fgm-srvy.xml                | 4 ++--
 NumericalData/CDPP-AMDA/MMS/MMS1/FPI/mms1-fpi-brst.current.xml        | 4 ++--
 NumericalData/CDPP-AMDA/MMS/MMS1/FPI/mms1-fpi-brst.desm.xml           | 4 ++--
 NumericalData/CDPP-AMDA/MMS/MMS1/FPI/mms1-fpi-brst.dism.xml           | 4 ++--
 NumericalData/CDPP-AMDA/MMS/MMS1/FPI/mms1-fpi-current.xml             | 4 ++--
 NumericalData/CDPP-AMDA/MMS/MMS1/FPI/mms1-fpi-desmoms.xml             | 4 ++--
 NumericalData/CDPP-AMDA/MMS/MMS1/FPI/mms1-fpi-dismoms.xml             | 4 ++--
 NumericalData/CDPP-AMDA/MMS/MMS1/HPCA/mms1-hpca-brst.xml              | 4 ++--
 NumericalData/CDPP-AMDA/MMS/MMS1/HPCA/mms1-hpca-moms.xml              | 4 ++--
 NumericalData/CDPP-AMDA/MMS/MMS1/HPCA/mms1-hpca-srvy.xml              | 4 ++--
 NumericalData/CDPP-AMDA/MMS/MMS1/Models/mms1-msph-models.xml          | 2 +-
 NumericalData/CDPP-AMDA/MMS/MMS1/Models/mms1-t96-model.xml            | 2 +-
 NumericalData/CDPP-AMDA/MMS/MMS1234/Ephemeris/mms1234-orb-t89d.xml    | 4 ++--
 NumericalData/CDPP-AMDA/MMS/MMS1234/mms1-fgm-brstcurl.xml             | 2 +-
 NumericalData/CDPP-AMDA/MMS/MMS1234/mms1-fgm-current.xml              | 2 +-
 NumericalData/CDPP-AMDA/MMS/MMS2/EDP/mms2-edp-dce.xml                 | 6 +++---
 NumericalData/CDPP-AMDA/MMS/MMS2/EDP/mms2-edp-hfesp.xml               | 6 +++---
 NumericalData/CDPP-AMDA/MMS/MMS2/EDP/mms2-edp-scpot.xml               | 6 +++---
 NumericalData/CDPP-AMDA/MMS/MMS2/Ephemeris/mms2-orb-t89d.xml          | 4 ++--
 NumericalData/CDPP-AMDA/MMS/MMS2/FGM/mms2-fgm-brst.xml                | 4 ++--
 NumericalData/CDPP-AMDA/MMS/MMS2/FGM/mms2-fgm-srvy.xml                | 4 ++--
 NumericalData/CDPP-AMDA/MMS/MMS2/FPI/mms2-fpi-brst.current.xml        | 4 ++--
 NumericalData/CDPP-AMDA/MMS/MMS2/FPI/mms2-fpi-brst.desm.xml           | 4 ++--
 NumericalData/CDPP-AMDA/MMS/MMS2/FPI/mms2-fpi-brst.dism.xml           | 4 ++--
 NumericalData/CDPP-AMDA/MMS/MMS2/FPI/mms2-fpi-current.xml             | 4 ++--
 NumericalData/CDPP-AMDA/MMS/MMS2/FPI/mms2-fpi-desmoms.xml             | 4 ++--
 NumericalData/CDPP-AMDA/MMS/MMS2/FPI/mms2-fpi-dismoms.xml             | 4 ++--
 NumericalData/CDPP-AMDA/MMS/MMS2/HPCA/mms2-hpca-brst.xml              | 4 ++--
 NumericalData/CDPP-AMDA/MMS/MMS2/Models/mms2-msph-models.xml          | 2 +-
 NumericalData/CDPP-AMDA/MMS/MMS2/Models/mms2-t96-model.xml            | 2 +-
 NumericalData/CDPP-AMDA/MMS/MMS3/EDP/mms3-edp-dce.xml                 | 6 +++---
 NumericalData/CDPP-AMDA/MMS/MMS3/EDP/mms3-edp-hfesp.xml               | 6 +++---
 NumericalData/CDPP-AMDA/MMS/MMS3/EDP/mms3-edp-scpot.xml               | 6 +++---
 NumericalData/CDPP-AMDA/MMS/MMS3/Ephemeris/mms3-orb-t89d.xml          | 4 ++--
 NumericalData/CDPP-AMDA/MMS/MMS3/FGM/mms3-fgm-brst.xml                | 4 ++--
 NumericalData/CDPP-AMDA/MMS/MMS3/FGM/mms3-fgm-srvy.xml                | 4 ++--
 NumericalData/CDPP-AMDA/MMS/MMS3/FPI/mms3-fpi-brst.current.xml        | 4 ++--
 NumericalData/CDPP-AMDA/MMS/MMS3/FPI/mms3-fpi-brst.desm.xml           | 4 ++--
 NumericalData/CDPP-AMDA/MMS/MMS3/FPI/mms3-fpi-brst.dism.xml           | 4 ++--
 NumericalData/CDPP-AMDA/MMS/MMS3/FPI/mms3-fpi-current.xml             | 4 ++--
 NumericalData/CDPP-AMDA/MMS/MMS3/FPI/mms3-fpi-desmoms.xml             | 4 ++--
 NumericalData/CDPP-AMDA/MMS/MMS3/FPI/mms3-fpi-dismoms.xml             | 4 ++--
 NumericalData/CDPP-AMDA/MMS/MMS3/HPCA/mms3-hpca-brst.xml              | 4 ++--
 NumericalData/CDPP-AMDA/MMS/MMS3/Models/mms3-msph-models.xml          | 2 +-
 NumericalData/CDPP-AMDA/MMS/MMS3/Models/mms3-t96-model.xml            | 2 +-
 NumericalData/CDPP-AMDA/MMS/MMS4/EDP/mms4-edp-dce.xml                 | 6 +++---
 NumericalData/CDPP-AMDA/MMS/MMS4/EDP/mms4-edp-hfesp.xml               | 6 +++---
 NumericalData/CDPP-AMDA/MMS/MMS4/EDP/mms4-edp-scpot.xml               | 6 +++---
 NumericalData/CDPP-AMDA/MMS/MMS4/Ephemeris/mms4-orb-t89d.xml          | 4 ++--
 NumericalData/CDPP-AMDA/MMS/MMS4/FGM/mms4-fgm-brst.xml                | 4 ++--
 NumericalData/CDPP-AMDA/MMS/MMS4/FGM/mms4-fgm-srvy.xml                | 4 ++--
 NumericalData/CDPP-AMDA/MMS/MMS4/FPI/mms4-fpi-brst.current.xml        | 4 ++--
 NumericalData/CDPP-AMDA/MMS/MMS4/FPI/mms4-fpi-brst.desm.xml           | 4 ++--
 NumericalData/CDPP-AMDA/MMS/MMS4/FPI/mms4-fpi-brst.dism.xml           | 4 ++--
 NumericalData/CDPP-AMDA/MMS/MMS4/FPI/mms4-fpi-current.xml             | 4 ++--
 NumericalData/CDPP-AMDA/MMS/MMS4/FPI/mms4-fpi-desmoms.xml             | 4 ++--
 NumericalData/CDPP-AMDA/MMS/MMS4/FPI/mms4-fpi-dismoms.xml             | 4 ++--
 NumericalData/CDPP-AMDA/MMS/MMS4/HPCA/mms4-hpca-brst.xml              | 4 ++--
 NumericalData/CDPP-AMDA/MMS/MMS4/Models/mms4-msph-models.xml          | 2 +-
 NumericalData/CDPP-AMDA/MMS/MMS4/Models/mms4-t96-model.xml            | 2 +-
 NumericalData/CDPP-AMDA/Mariner10/Ephemeris/m10-m1-orb.xml            | 2 +-
 NumericalData/CDPP-AMDA/Mariner10/Ephemeris/m10-m2-orb.xml            | 2 +-
 NumericalData/CDPP-AMDA/Mariner10/Ephemeris/m10-m3-orb.xml            | 2 +-
 NumericalData/CDPP-AMDA/Mariner10/MAG/m10-mag-m1highres.xml           | 2 +-
 NumericalData/CDPP-AMDA/Mariner10/MAG/m10-mag-m1mean6s.xml            | 2 +-
 NumericalData/CDPP-AMDA/Mariner10/MAG/m10-mag-m2mean6s.xml            | 2 +-
 NumericalData/CDPP-AMDA/Mariner10/MAG/m10-mag-m3highres.xml           | 2 +-
 NumericalData/CDPP-AMDA/Mariner10/MAG/m10-mag-m3mean6s.xml            | 2 +-
 NumericalData/CDPP-AMDA/Mariner10/PLS/m10-pls-m1count.xml             | 2 +-
 NumericalData/CDPP-AMDA/Mariner10/PLS/m10-pls-m1mom.xml               | 2 +-
 NumericalData/CDPP-AMDA/Mariner10/PLS/m10-pls-m2count.xml             | 2 +-
 NumericalData/CDPP-AMDA/Mariner10/PLS/m10-pls-m2mom.xml               | 2 +-
 NumericalData/CDPP-AMDA/Mariner10/PLS/m10-pls-m3count.xml             | 2 +-
 NumericalData/CDPP-AMDA/Mariner10/PLS/m10-pls-m3mom.xml               | 2 +-
 NumericalData/CDPP-AMDA/POLAR/Hydra/plr-hyd-h0.xml                    | 2 +-
 NumericalData/CDPP-AMDA/POLAR/Hydra/plr-hyd-mom.xml                   | 2 +-
 NumericalData/CDPP-AMDA/POLAR/Models/plr-msph-models.xml              | 2 +-
 NumericalData/CDPP-AMDA/POLAR/Models/plr-t96-model.xml                | 2 +-
 NumericalData/CDPP-AMDA/PSP/MAG/psp-mag-1min.xml                      | 2 +-
 NumericalData/CDPP-AMDA/PSP/MAG/psp-mag-4cyc.xml                      | 2 +-
 NumericalData/CDPP-AMDA/PSP/MAG/psp-mag-vflyby1.xml                   | 2 +-
 NumericalData/CDPP-AMDA/PSP/MAG/psp-mag-vflyby2.xml                   | 2 +-
 NumericalData/CDPP-AMDA/PSP/MAG/psp-mag-vflyby3.xml                   | 2 +-
 NumericalData/CDPP-AMDA/PSP/MAG/psp-mag-vflyby4.xml                   | 2 +-
 NumericalData/CDPP-AMDA/PSP/ORBIT/psp-orb-all.xml                     | 2 +-
 NumericalData/CDPP-AMDA/PSP/ORBIT/psp-orb-venus1.xml                  | 2 +-
 NumericalData/CDPP-AMDA/PSP/ORBIT/psp-orb-venus2.xml                  | 2 +-
 NumericalData/CDPP-AMDA/PSP/ORBIT/psp-orb-venus3.xml                  | 2 +-
 NumericalData/CDPP-AMDA/PSP/ORBIT/psp-orb-venus4.xml                  | 2 +-
 NumericalData/CDPP-AMDA/PSP/psp-fld-qfl.xml                           | 2 +-
 NumericalData/CDPP-AMDA/Phobos2/ASPERA/pho-asp-el.xml                 | 2 +-
 NumericalData/CDPP-AMDA/Phobos2/ASPERA/pho-asp-ion.xml                | 2 +-
 NumericalData/CDPP-AMDA/Phobos2/ephemeris/pho-orb-mso.xml             | 2 +-
 NumericalData/CDPP-AMDA/Planets/Earth/earth-info-mag.xml              | 4 ++--
 NumericalData/CDPP-AMDA/Rosetta/AUX/ros-aux-all.xml                   | 2 +-
 NumericalData/CDPP-AMDA/Rosetta/Ephemeris/ros-orb-comet.xml           | 2 +-
 NumericalData/CDPP-AMDA/Rosetta/Ephemeris/ros-orb-cruise.xml          | 2 +-
 NumericalData/CDPP-AMDA/Rosetta/Ephemeris/sun-pol-cgck.xml            | 2 +-
 NumericalData/CDPP-AMDA/Rosetta/IES/ros-elc-az.xml                    | 6 +++---
 NumericalData/CDPP-AMDA/Rosetta/IES/ros-elc-azimuth.xml               | 6 +++---
 NumericalData/CDPP-AMDA/Rosetta/IES/ros-elc-elev.xml                  | 6 +++---
 NumericalData/CDPP-AMDA/Rosetta/IES/ros-elc-elv.xml                   | 6 +++---
 NumericalData/CDPP-AMDA/Rosetta/IES/ros-elc-en.xml                    | 6 +++---
 NumericalData/CDPP-AMDA/Rosetta/IES/ros-elc-energy.xml                | 6 +++---
 NumericalData/CDPP-AMDA/Rosetta/IES/ros-ion-az.xml                    | 6 +++---
 NumericalData/CDPP-AMDA/Rosetta/IES/ros-ion-azimuth.xml               | 6 +++---
 NumericalData/CDPP-AMDA/Rosetta/IES/ros-ion-elev.xml                  | 6 +++---
 NumericalData/CDPP-AMDA/Rosetta/IES/ros-ion-elv.xml                   | 6 +++---
 NumericalData/CDPP-AMDA/Rosetta/IES/ros-ion-en.xml                    | 6 +++---
 NumericalData/CDPP-AMDA/Rosetta/IES/ros-ion-energy.xml                | 6 +++---
 NumericalData/CDPP-AMDA/Rosetta/LAP/ros-lap-asw.xml                   | 4 ++--
 NumericalData/CDPP-AMDA/Rosetta/LAP/ros-lap-efl.xml                   | 4 ++--
 NumericalData/CDPP-AMDA/Rosetta/LAP/ros-lap-ned.xml                   | 4 ++--
 NumericalData/CDPP-AMDA/Rosetta/LAP/ros-lap-nel.xml                   | 4 ++--
 NumericalData/CDPP-AMDA/Rosetta/LAP/ros-lap-pho.xml                   | 4 ++--
 NumericalData/CDPP-AMDA/Rosetta/LAP/ros-lap-usc.xml                   | 4 ++--
 NumericalData/CDPP-AMDA/Rosetta/MAG/ros-magib-1s.xml                  | 2 +-
 NumericalData/CDPP-AMDA/Rosetta/MAG/ros-magib-32s.xml                 | 2 +-
 NumericalData/CDPP-AMDA/Rosetta/MAG/ros-magib-rsmp.xml                | 2 +-
 NumericalData/CDPP-AMDA/Rosetta/MAG/ros-magib-rsmp1s.xml              | 2 +-
 NumericalData/CDPP-AMDA/Rosetta/MAG/ros-magob-1s.xml                  | 2 +-
 NumericalData/CDPP-AMDA/Rosetta/MAG/ros-magob-20hz.xml                | 2 +-
 NumericalData/CDPP-AMDA/Rosetta/MAG/ros-magob-rsmp.xml                | 2 +-
 NumericalData/CDPP-AMDA/Rosetta/MAG/ros-magob-rsmp1s.xml              | 2 +-
 NumericalData/CDPP-AMDA/Rosetta/MIP/ros-mip-estim.xml                 | 4 ++--
 NumericalData/CDPP-AMDA/Rosetta/MIP/ros-mip-ldl.xml                   | 4 ++--
 NumericalData/CDPP-AMDA/Rosetta/MIP/ros-mip-ldlphase.xml              | 4 ++--
 NumericalData/CDPP-AMDA/Rosetta/MIP/ros-mip-pass.xml                  | 4 ++--
 NumericalData/CDPP-AMDA/Rosetta/MIP/ros-mip-pasw.xml                  | 4 ++--
 NumericalData/CDPP-AMDA/Rosetta/MIP/ros-mip-surv.xml                  | 4 ++--
 NumericalData/CDPP-AMDA/Rosetta/MIP/ros-mip-survphase.xml             | 4 ++--
 NumericalData/CDPP-AMDA/Rosetta/RSN/ros-rsn-bg.xml                    | 2 +-
 NumericalData/CDPP-AMDA/Rosetta/RSN/ros-rsn-cops.xml                  | 2 +-
 NumericalData/CDPP-AMDA/Rosetta/RSN/ros-rsn-den.xml                   | 2 +-
 NumericalData/CDPP-AMDA/Rosetta/RSN/ros-rsn-ng.xml                    | 2 +-
 NumericalData/CDPP-AMDA/Rosetta/RSN/ros-rsn-rg.xml                    | 2 +-
 NumericalData/CDPP-AMDA/Rosetta/RSN/ros-rsn-sn.xml                    | 2 +-
 NumericalData/CDPP-AMDA/Rosetta/RSN/ros-rsn-sr.xml                    | 2 +-
 NumericalData/CDPP-AMDA/STEREO-A/Ephemeris/sta-l2-orb.xml             | 2 +-
 NumericalData/CDPP-AMDA/STEREO-A/HET/sta-het-1d.xml                   | 2 +-
 NumericalData/CDPP-AMDA/STEREO-A/HET/sta-het-1h.xml                   | 2 +-
 NumericalData/CDPP-AMDA/STEREO-A/HET/sta-het-1min.xml                 | 2 +-
 NumericalData/CDPP-AMDA/STEREO-A/LET/sta-let-10min.xml                | 2 +-
 NumericalData/CDPP-AMDA/STEREO-A/LET/sta-let-1day.xml                 | 2 +-
 NumericalData/CDPP-AMDA/STEREO-A/LET/sta-let-1hour.xml                | 2 +-
 NumericalData/CDPP-AMDA/STEREO-A/MAG/sta-b-1min.xml                   | 2 +-
 NumericalData/CDPP-AMDA/STEREO-A/MAG/sta-mag-mag.xml                  | 2 +-
 NumericalData/CDPP-AMDA/STEREO-A/PLASTIC/sta-l2-pla.xml               | 2 +-
 NumericalData/CDPP-AMDA/STEREO-A/SEPT/sta-sept-1day.xml               | 2 +-
 NumericalData/CDPP-AMDA/STEREO-A/SEPT/sta-sept-1hour.xml              | 2 +-
 NumericalData/CDPP-AMDA/STEREO-A/SEPT/sta-sept-1min.xml               | 2 +-
 NumericalData/CDPP-AMDA/STEREO-A/SIT/sta-sit-1d.xml                   | 2 +-
 NumericalData/CDPP-AMDA/STEREO-A/SIT/sta-sit-1h.xml                   | 2 +-
 NumericalData/CDPP-AMDA/STEREO-A/SIT/sta-sit-1min.xml                 | 2 +-
 NumericalData/CDPP-AMDA/STEREO-A/SWEA/sta-swea-mom.xml                | 4 ++--
 NumericalData/CDPP-AMDA/STEREO-A/SWEA/sta-swea-pad.xml                | 4 ++--
 NumericalData/CDPP-AMDA/STEREO-B/Ephemeris/stb-l2-orb.xml             | 2 +-
 NumericalData/CDPP-AMDA/STEREO-B/HET/stb-het-1d.xml                   | 2 +-
 NumericalData/CDPP-AMDA/STEREO-B/HET/stb-het-1h.xml                   | 2 +-
 NumericalData/CDPP-AMDA/STEREO-B/HET/stb-het-1min.xml                 | 2 +-
 NumericalData/CDPP-AMDA/STEREO-B/LET/stb-let-10min.xml                | 2 +-
 NumericalData/CDPP-AMDA/STEREO-B/LET/stb-let-1day.xml                 | 2 +-
 NumericalData/CDPP-AMDA/STEREO-B/LET/stb-let-1hour.xml                | 2 +-
 NumericalData/CDPP-AMDA/STEREO-B/MAG/stb-b-1min.xml                   | 2 +-
 NumericalData/CDPP-AMDA/STEREO-B/MAG/stb-mag-mag.xml                  | 2 +-
 NumericalData/CDPP-AMDA/STEREO-B/PLASTIC/stb-l2-pla.xml               | 2 +-
 NumericalData/CDPP-AMDA/STEREO-B/SEPT/stb-sept-1day.xml               | 2 +-
 NumericalData/CDPP-AMDA/STEREO-B/SEPT/stb-sept-1hour.xml              | 2 +-
 NumericalData/CDPP-AMDA/STEREO-B/SEPT/stb-sept-1min.xml               | 2 +-
 NumericalData/CDPP-AMDA/STEREO-B/SIT/stb-sit-1d.xml                   | 2 +-
 NumericalData/CDPP-AMDA/STEREO-B/SIT/stb-sit-1h.xml                   | 2 +-
 NumericalData/CDPP-AMDA/STEREO-B/SIT/stb-sit-1min.xml                 | 2 +-
 NumericalData/CDPP-AMDA/STEREO-B/SWEA/stb-swea-mom.xml                | 4 ++--
 NumericalData/CDPP-AMDA/STEREO-B/SWEA/stb-swea-pad.xml                | 4 ++--
 NumericalData/CDPP-AMDA/SWARM-A/Ephemeris/swarma-orb-all.xml          | 2 +-
 NumericalData/CDPP-AMDA/SWARM-A/Ephemeris/swarma-orb-lp.xml           | 2 +-
 NumericalData/CDPP-AMDA/SWARM-A/Ephemeris/swarma-orb-tii.xml          | 2 +-
 NumericalData/CDPP-AMDA/SWARM-A/GNSS/swarma-gps-all.xml               | 2 +-
 NumericalData/CDPP-AMDA/SWARM-A/LP/swarma-lp-all.xml                  | 2 +-
 NumericalData/CDPP-AMDA/SWARM-A/MAG/swarma-fac-all.xml                | 2 +-
 NumericalData/CDPP-AMDA/SWARM-A/MAG/swarma-mag-all.xml                | 2 +-
 NumericalData/CDPP-AMDA/SWARM-A/MAG/swarma-mag-tii.xml                | 2 +-
 NumericalData/CDPP-AMDA/SWARM-A/MAG/swarmac-fac-all.xml               | 2 +-
 NumericalData/CDPP-AMDA/SWARM-A/TII/swarma-tii-all.xml                | 2 +-
 NumericalData/CDPP-AMDA/SWARM-A/TII/swarma-tii-prov.xml               | 2 +-
 NumericalData/CDPP-AMDA/SWARM-B/Ephemeris/swarmb-orb-all.xml          | 2 +-
 NumericalData/CDPP-AMDA/SWARM-B/Ephemeris/swarmb-orb-lp.xml           | 2 +-
 NumericalData/CDPP-AMDA/SWARM-B/Ephemeris/swarmb-orb-tii.xml          | 2 +-
 NumericalData/CDPP-AMDA/SWARM-B/GNSS/swarmb-gps-all.xml               | 2 +-
 NumericalData/CDPP-AMDA/SWARM-B/LP/swarmb-lp-all.xml                  | 2 +-
 NumericalData/CDPP-AMDA/SWARM-B/MAG/swarmb-fac-all.xml                | 2 +-
 NumericalData/CDPP-AMDA/SWARM-B/MAG/swarmb-mag-all.xml                | 2 +-
 NumericalData/CDPP-AMDA/SWARM-B/MAG/swarmb-mag-tii.xml                | 2 +-
 NumericalData/CDPP-AMDA/SWARM-B/TII/swarmb-tii-all.xml                | 2 +-
 NumericalData/CDPP-AMDA/SWARM-B/TII/swarmb-tii-prov.xml               | 2 +-
 NumericalData/CDPP-AMDA/SWARM-C/Ephemeris/swarmc-orb-all.xml          | 2 +-
 NumericalData/CDPP-AMDA/SWARM-C/Ephemeris/swarmc-orb-lp.xml           | 2 +-
 NumericalData/CDPP-AMDA/SWARM-C/Ephemeris/swarmc-orb-tii.xml          | 2 +-
 NumericalData/CDPP-AMDA/SWARM-C/GNSS/swarmc-gps-all.xml               | 2 +-
 NumericalData/CDPP-AMDA/SWARM-C/LP/swarmc-lp-all.xml                  | 2 +-
 NumericalData/CDPP-AMDA/SWARM-C/MAG/swarmc-fac-all.xml                | 2 +-
 NumericalData/CDPP-AMDA/SWARM-C/MAG/swarmc-mag-all.xml                | 2 +-
 NumericalData/CDPP-AMDA/SWARM-C/MAG/swarmc-mag-tii.xml                | 2 +-
 NumericalData/CDPP-AMDA/SWARM-C/TII/swarmc-tii-all.xml                | 2 +-
 NumericalData/CDPP-AMDA/SWARM-C/TII/swarmc-tii-prov.xml               | 2 +-
 NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-ept-anti.xml             | 2 +-
 NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-ept-e.anti.xml           | 2 +-
 NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-ept-e.north.xml          | 2 +-
 NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-ept-e.south.xml          | 2 +-
 NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-ept-e.sun.xml            | 2 +-
 NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-ept-e.total.xml          | 2 +-
 NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-ept-north.xml            | 2 +-
 NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-ept-south.xml            | 2 +-
 NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-ept-sun.xml              | 2 +-
 NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-ept-total.xml            | 2 +-
 NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-het-anti.1.xml           | 2 +-
 NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-het-anti.2.xml           | 2 +-
 NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-het-anti.3.xml           | 2 +-
 NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-het-anti.4.xml           | 2 +-
 NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-het-anti.xml             | 2 +-
 NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-het-north.1.xml          | 2 +-
 NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-het-north.2.xml          | 2 +-
 NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-het-north.3.xml          | 2 +-
 NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-het-north.4.xml          | 2 +-
 NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-het-north.xml            | 2 +-
 NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-het-south.1.xml          | 2 +-
 NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-het-south.2.xml          | 2 +-
 NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-het-south.3.xml          | 2 +-
 NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-het-south.4.xml          | 2 +-
 NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-het-south.xml            | 2 +-
 NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-het-sun.1.xml            | 2 +-
 NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-het-sun.2.xml            | 2 +-
 NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-het-sun.3.xml            | 2 +-
 NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-het-sun.4.xml            | 2 +-
 NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-het-sun.xml              | 2 +-
 NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-het-total.1.xml          | 2 +-
 NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-het-total.2.xml          | 2 +-
 NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-het-total.3.xml          | 2 +-
 NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-het-total.4.xml          | 2 +-
 NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-het-total.xml            | 2 +-
 NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-step-rates.xml           | 2 +-
 NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-step-rtn.xml             | 2 +-
 NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/solo-sisa-slow.xml          | 2 +-
 NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/solo-sisb-slow.xml          | 2 +-
 NumericalData/CDPP-AMDA/Solar_Orbiter/Ephemeris/so-orb-all.xml        | 2 +-
 NumericalData/CDPP-AMDA/Solar_Orbiter/Ephemeris/so-orb-venus1.xml     | 2 +-
 NumericalData/CDPP-AMDA/Solar_Orbiter/Ephemeris/so-orb-venus2.xml     | 2 +-
 NumericalData/CDPP-AMDA/Solar_Orbiter/MAG/so-mag-1min.xml             | 2 +-
 NumericalData/CDPP-AMDA/Solar_Orbiter/MAG/so-mag-rtnhr.xml            | 2 +-
 NumericalData/CDPP-AMDA/Solar_Orbiter/MAG/solo-mag-8s.xml             | 2 +-
 NumericalData/CDPP-AMDA/Solar_Orbiter/MAG/solo-mag-hr.cdag.xml        | 2 +-
 NumericalData/CDPP-AMDA/Solar_Orbiter/MAG/solo-mag-hr.xml             | 2 +-
 NumericalData/CDPP-AMDA/Solar_Orbiter/PAS/so-pas-3d.xml               | 2 +-
 NumericalData/CDPP-AMDA/Solar_Orbiter/PAS/so-pas-hk.xml               | 2 +-
 NumericalData/CDPP-AMDA/Solar_Orbiter/PAS/so-pas-l2.3d.xml            | 2 +-
 NumericalData/CDPP-AMDA/Solar_Orbiter/PAS/so-pas-l2.omni.xml          | 2 +-
 NumericalData/CDPP-AMDA/Solar_Orbiter/PAS/so-pas-mom.xml              | 2 +-
 NumericalData/CDPP-AMDA/Solar_Orbiter/PAS/so-pas-momgr1.xml           | 2 +-
 NumericalData/CDPP-AMDA/Solar_Orbiter/PAS/so-pas-momtest.xml          | 2 +-
 NumericalData/CDPP-AMDA/THEMIS/A/Models/tha-msph-models.xml           | 2 +-
 NumericalData/CDPP-AMDA/THEMIS/A/Models/tha-t96-model.xml             | 2 +-
 NumericalData/CDPP-AMDA/THEMIS/B/Models/thb-msph-models.xml           | 2 +-
 NumericalData/CDPP-AMDA/THEMIS/B/Models/thb-t96-model.xml             | 2 +-
 NumericalData/CDPP-AMDA/THEMIS/C/Models/thc-msph-models.xml           | 2 +-
 NumericalData/CDPP-AMDA/THEMIS/C/Models/thc-t96-model.xml             | 2 +-
 NumericalData/CDPP-AMDA/THEMIS/D/Models/thd-msph-models.xml           | 2 +-
 NumericalData/CDPP-AMDA/THEMIS/D/Models/thd-t96-model.xml             | 2 +-
 NumericalData/CDPP-AMDA/THEMIS/E/Models/the-msph-models.xml           | 2 +-
 NumericalData/CDPP-AMDA/THEMIS/E/Models/the-t96-model.xml             | 2 +-
 NumericalData/CDPP-AMDA/TIMED/SEE/timed-see-l3.xml                    | 2 +-
 NumericalData/CDPP-AMDA/TIMED/SEE/timed-see-l3a.xml                   | 2 +-
 NumericalData/CDPP-AMDA/VEX/ELS/vex-els-all.xml                       | 2 +-
 NumericalData/CDPP-AMDA/VEX/IMA/vex-ima-bg.xml                        | 2 +-
 NumericalData/CDPP-AMDA/VEX/IMA/vex-ima-extra.xml                     | 4 ++--
 NumericalData/CDPP-AMDA/VEX/IMA/vex-ima-sw.xml                        | 4 ++--
 NumericalData/CDPP-AMDA/VEX/MAG/vex-mag-all.xml                       | 2 +-
 NumericalData/CDPP-AMDA/VEX/MAG/vex-mag-hz.xml                        | 2 +-
 NumericalData/CDPP-AMDA/Voyager1/CRS/vo1-crs-full.xml                 | 2 +-
 NumericalData/CDPP-AMDA/Voyager1/Ephemeris/vo1-ephem-all.xml          | 2 +-
 NumericalData/CDPP-AMDA/Voyager1/LECP/vo1-lecp-full.xml               | 2 +-
 NumericalData/CDPP-AMDA/Voyager1/PLS/vo1-pls-full.xml                 | 2 +-
 NumericalData/CDPP-AMDA/Voyager2/CRS/vo2-crs-full.xml                 | 2 +-
 NumericalData/CDPP-AMDA/Voyager2/Ephemeris/vo2-ephem-all.xml          | 2 +-
 NumericalData/CDPP-AMDA/Voyager2/LECP/vo2-lecp-full.xml               | 2 +-
 NumericalData/CDPP-AMDA/Voyager2/PLS/vo2-pls-full.xml                 | 2 +-
 NumericalOutput/CDPP-AMDA/BALLISTIC/bls-bepi-dsc.xml                  | 2 +-
 NumericalOutput/CDPP-AMDA/BALLISTIC/bls-bepi-omni.xml                 | 2 +-
 NumericalOutput/CDPP-AMDA/BALLISTIC/bls-jupiter-omni.xml              | 2 +-
 NumericalOutput/CDPP-AMDA/BALLISTIC/bls-mars-omni.xml                 | 2 +-
 NumericalOutput/CDPP-AMDA/BALLISTIC/bls-mercury-omni.xml              | 2 +-
 NumericalOutput/CDPP-AMDA/BALLISTIC/bls-neptune-omni.xml              | 2 +-
 NumericalOutput/CDPP-AMDA/BALLISTIC/bls-psp-dsc.xml                   | 2 +-
 NumericalOutput/CDPP-AMDA/BALLISTIC/bls-psp-omni.xml                  | 2 +-
 NumericalOutput/CDPP-AMDA/BALLISTIC/bls-ros-omni.xml                  | 2 +-
 NumericalOutput/CDPP-AMDA/BALLISTIC/bls-saturn-omni.xml               | 2 +-
 NumericalOutput/CDPP-AMDA/BALLISTIC/bls-solo-dsc.xml                  | 2 +-
 NumericalOutput/CDPP-AMDA/BALLISTIC/bls-uranus-omni.xml               | 2 +-
 NumericalOutput/CDPP-AMDA/BALLISTIC/bls-venus-omni.xml                | 2 +-
 NumericalOutput/CDPP-AMDA/CAIN/b_cain.xml                             | 4 ++--
 NumericalOutput/CDPP-AMDA/JRM09/b_jrm09.xml                           | 4 ++--
 NumericalOutput/CDPP-AMDA/MORSCHHAUSER/b_morschhauser.xml             | 6 +++---
 NumericalOutput/CDPP-AMDA/TAO/Bepi/tao-bepi-dsc.xml                   | 4 ++--
 NumericalOutput/CDPP-AMDA/TAO/Bepi/tao-bepi-sta.xml                   | 4 ++--
 NumericalOutput/CDPP-AMDA/TAO/Bepi/tao-bepi-sw.xml                    | 4 ++--
 NumericalOutput/CDPP-AMDA/TAO/Bepi/tao-bepi-swrt.xml                  | 4 ++--
 NumericalOutput/CDPP-AMDA/TAO/Cassini/tao-cass-sw.xml                 | 4 ++--
 NumericalOutput/CDPP-AMDA/TAO/Juno/tao-juno-sw.xml                    | 4 ++--
 NumericalOutput/CDPP-AMDA/TAO/Jupiter/tao-jup-dsc.xml                 | 4 ++--
 NumericalOutput/CDPP-AMDA/TAO/Jupiter/tao-jup-sta.xml                 | 4 ++--
 NumericalOutput/CDPP-AMDA/TAO/Jupiter/tao-jup-stb.xml                 | 4 ++--
 NumericalOutput/CDPP-AMDA/TAO/Jupiter/tao-jup-sw.xml                  | 4 ++--
 NumericalOutput/CDPP-AMDA/TAO/Jupiter/tao-jup-swrt.xml                | 4 ++--
 NumericalOutput/CDPP-AMDA/TAO/Mars/tao-mars-dsc.xml                   | 4 ++--
 NumericalOutput/CDPP-AMDA/TAO/Mars/tao-mars-sta.xml                   | 4 ++--
 NumericalOutput/CDPP-AMDA/TAO/Mars/tao-mars-stb.xml                   | 4 ++--
 NumericalOutput/CDPP-AMDA/TAO/Mars/tao-mars-sw.xml                    | 4 ++--
 NumericalOutput/CDPP-AMDA/TAO/Mars/tao-mars-swrt.xml                  | 4 ++--
 NumericalOutput/CDPP-AMDA/TAO/Mercury/tao-mercury-dsc.xml             | 4 ++--
 NumericalOutput/CDPP-AMDA/TAO/Mercury/tao-mercury-sta.xml             | 4 ++--
 NumericalOutput/CDPP-AMDA/TAO/Mercury/tao-mercury-stb.xml             | 4 ++--
 NumericalOutput/CDPP-AMDA/TAO/Mercury/tao-mercury-sw.xml              | 4 ++--
 NumericalOutput/CDPP-AMDA/TAO/Mercury/tao-mercury-swrt.xml            | 4 ++--
 NumericalOutput/CDPP-AMDA/TAO/Neptune/tao-nep-dsc.xml                 | 4 ++--
 NumericalOutput/CDPP-AMDA/TAO/Neptune/tao-nep-sta.xml                 | 4 ++--
 NumericalOutput/CDPP-AMDA/TAO/Neptune/tao-nep-stb.xml                 | 4 ++--
 NumericalOutput/CDPP-AMDA/TAO/Neptune/tao-nep-sw.xml                  | 4 ++--
 NumericalOutput/CDPP-AMDA/TAO/Neptune/tao-nep-swrt.xml                | 4 ++--
 NumericalOutput/CDPP-AMDA/TAO/Psp/tao-psp-dsc.xml                     | 4 ++--
 NumericalOutput/CDPP-AMDA/TAO/Psp/tao-psp-sta.xml                     | 4 ++--
 NumericalOutput/CDPP-AMDA/TAO/Psp/tao-psp-sw.xml                      | 4 ++--
 NumericalOutput/CDPP-AMDA/TAO/Psp/tao-psp-swrt.xml                    | 4 ++--
 NumericalOutput/CDPP-AMDA/TAO/Rosetta/tao-ros-sw.xml                  | 4 ++--
 NumericalOutput/CDPP-AMDA/TAO/Saturn/tao-sat-dsc.xml                  | 4 ++--
 NumericalOutput/CDPP-AMDA/TAO/Saturn/tao-sat-sta.xml                  | 4 ++--
 NumericalOutput/CDPP-AMDA/TAO/Saturn/tao-sat-stb.xml                  | 4 ++--
 NumericalOutput/CDPP-AMDA/TAO/Saturn/tao-sat-sw.xml                   | 4 ++--
 NumericalOutput/CDPP-AMDA/TAO/Saturn/tao-sat-swrt.xml                 | 4 ++--
 NumericalOutput/CDPP-AMDA/TAO/So/tao-so-dsc.xml                       | 4 ++--
 NumericalOutput/CDPP-AMDA/TAO/So/tao-so-sw.xml                        | 4 ++--
 NumericalOutput/CDPP-AMDA/TAO/Uranus/tao-ura-dsc.xml                  | 4 ++--
 NumericalOutput/CDPP-AMDA/TAO/Uranus/tao-ura-sta.xml                  | 4 ++--
 NumericalOutput/CDPP-AMDA/TAO/Uranus/tao-ura-stb.xml                  | 4 ++--
 NumericalOutput/CDPP-AMDA/TAO/Uranus/tao-ura-sw.xml                   | 4 ++--
 NumericalOutput/CDPP-AMDA/TAO/Uranus/tao-ura-swrt.xml                 | 4 ++--
 NumericalOutput/CDPP-AMDA/TAO/Venus/tao-venus-dsc.xml                 | 4 ++--
 NumericalOutput/CDPP-AMDA/TAO/Venus/tao-venus-sta.xml                 | 4 ++--
 NumericalOutput/CDPP-AMDA/TAO/Venus/tao-venus-stb.xml                 | 4 ++--
 NumericalOutput/CDPP-AMDA/TAO/Venus/tao-venus-sw.xml                  | 4 ++--
 NumericalOutput/CDPP-AMDA/TAO/Venus/tao-venus-swrt.xml                | 4 ++--
 NumericalOutput/CDPP-AMDA/TSYG96/b_t96.xml                            | 4 ++--
 Observatory/CDPP-AMDA/Bepi.xml                                        | 2 +-
 Observatory/CDPP-AMDA/Cassini.xml                                     | 2 +-
 Observatory/CDPP-AMDA/DSCOVR.xml                                      | 2 +-
 Observatory/CDPP-AMDA/EISCAT.xml                                      | 2 +-
 Observatory/CDPP-AMDA/Ephemerides.xml                                 | 4 ++--
 Observatory/CDPP-AMDA/Fermi.xml                                       | 2 +-
 Observatory/CDPP-AMDA/Geotail.xml                                     | 4 ++--
 Observatory/CDPP-AMDA/Interball-Tail.xml                              | 2 +-
 Observatory/CDPP-AMDA/Interball.xml                                   | 2 +-
 Observatory/CDPP-AMDA/Juice.xml                                       | 2 +-
 Observatory/CDPP-AMDA/Juno.xml                                        | 2 +-
 Observatory/CDPP-AMDA/MAVEN.xml                                       | 2 +-
 Observatory/CDPP-AMDA/MEX.xml                                         | 4 ++--
 Observatory/CDPP-AMDA/Mariner10.xml                                   | 2 +-
 Observatory/CDPP-AMDA/POLAR.xml                                       | 2 +-
 Observatory/CDPP-AMDA/Pioneer.xml                                     | 2 +-
 Observatory/CDPP-AMDA/Rosetta.xml                                     | 2 +-
 Observatory/CDPP-AMDA/SWARM-A.xml                                     | 4 ++--
 Observatory/CDPP-AMDA/SWARM-B.xml                                     | 4 ++--
 Observatory/CDPP-AMDA/SWARM-C.xml                                     | 4 ++--
 Observatory/CDPP-AMDA/SWARM.xml                                       | 4 ++--
 Observatory/CDPP-AMDA/SolO.xml                                        | 2 +-
 Observatory/CDPP-AMDA/Solar.xml                                       | 2 +-
 Observatory/CDPP-AMDA/TIMED.xml                                       | 2 +-
 Observatory/CDPP-AMDA/Wind.xml                                        | 2 +-
 SimulationModel/CDPP-AMDA/Ballistic.xml                               | 2 +-
 SimulationModel/CDPP-AMDA/Cain.xml                                    | 2 +-
 SimulationModel/CDPP-AMDA/JRM09.xml                                   | 2 +-
 SimulationModel/CDPP-AMDA/Morschhauser.xml                            | 2 +-
 SimulationModel/CDPP-AMDA/Tao.xml                                     | 2 +-
 SimulationModel/CDPP-AMDA/Tsyganenko96.xml                            | 2 +-
 SimulationRun/CDPP-AMDA/BALLISTIC/Bepi.xml                            | 2 +-
 SimulationRun/CDPP-AMDA/BALLISTIC/Jupiter.xml                         | 2 +-
 SimulationRun/CDPP-AMDA/BALLISTIC/Mars.xml                            | 2 +-
 SimulationRun/CDPP-AMDA/BALLISTIC/Mercury.xml                         | 2 +-
 SimulationRun/CDPP-AMDA/BALLISTIC/Neptune.xml                         | 2 +-
 SimulationRun/CDPP-AMDA/BALLISTIC/Psp.xml                             | 2 +-
 SimulationRun/CDPP-AMDA/BALLISTIC/Rosetta.xml                         | 2 +-
 SimulationRun/CDPP-AMDA/BALLISTIC/Saturn.xml                          | 2 +-
 SimulationRun/CDPP-AMDA/BALLISTIC/SolO.xml                            | 2 +-
 SimulationRun/CDPP-AMDA/BALLISTIC/Uranus.xml                          | 2 +-
 SimulationRun/CDPP-AMDA/BALLISTIC/Venus.xml                           | 2 +-
 SimulationRun/CDPP-AMDA/CAIN/CainRun.xml                              | 4 ++--
 SimulationRun/CDPP-AMDA/JRM09/JRM09Run.xml                            | 2 +-
 SimulationRun/CDPP-AMDA/MORSCHHAUSER/MorschhauserRun.xml              | 4 ++--
 SimulationRun/CDPP-AMDA/TAO/Bepi.xml                                  | 2 +-
 SimulationRun/CDPP-AMDA/TAO/Cassini.xml                               | 2 +-
 SimulationRun/CDPP-AMDA/TAO/Juno.xml                                  | 2 +-
 SimulationRun/CDPP-AMDA/TAO/Jupiter.xml                               | 2 +-
 SimulationRun/CDPP-AMDA/TAO/Mars.xml                                  | 2 +-
 SimulationRun/CDPP-AMDA/TAO/Mercury.xml                               | 2 +-
 SimulationRun/CDPP-AMDA/TAO/Neptune.xml                               | 2 +-
 SimulationRun/CDPP-AMDA/TAO/Psp.xml                                   | 2 +-
 SimulationRun/CDPP-AMDA/TAO/Rosetta.xml                               | 2 +-
 SimulationRun/CDPP-AMDA/TAO/Saturn.xml                                | 2 +-
 SimulationRun/CDPP-AMDA/TAO/So.xml                                    | 2 +-
 SimulationRun/CDPP-AMDA/TAO/Uranus.xml                                | 2 +-
 SimulationRun/CDPP-AMDA/TAO/Venus.xml                                 | 2 +-
 SimulationRun/CDPP-AMDA/TSYG96/Tsyg96Run.xml                          | 4 ++--
 879 files changed, 1248 insertions(+), 1250 deletions(-)

diff --git a/Instrument/CDPP-AMDA/ACE/Ephemeris.xml b/Instrument/CDPP-AMDA/ACE/Ephemeris.xml
index 51124cf..dcf877d 100644
--- a/Instrument/CDPP-AMDA/ACE/Ephemeris.xml
+++ b/Instrument/CDPP-AMDA/ACE/Ephemeris.xml
@@ -10,7 +10,7 @@
       <Description>ACE spacecraft positions</Description>      
       <Acknowledgement></Acknowledgement>
       <Contact>
-        <PersonID>spase://CNES/Person/Elena.Budnik</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Elena.Budnik</PersonID>
         <Role>TechnicalContact</Role>
       </Contact>
     </ResourceHeader>
diff --git a/Instrument/CDPP-AMDA/ACE/SWEPAM.xml b/Instrument/CDPP-AMDA/ACE/SWEPAM.xml
index 5b0581b..1b120cd 100644
--- a/Instrument/CDPP-AMDA/ACE/SWEPAM.xml
+++ b/Instrument/CDPP-AMDA/ACE/SWEPAM.xml
@@ -28,7 +28,7 @@
       </Description>
       <Contact>
         <!-- David McComas -->
-        <PersonID>spase://CNES/Person/David.J.McComas</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/David.J.McComas</PersonID>
         <Role>CoInvestigator</Role>
       </Contact>
       <Contact>
diff --git a/Instrument/CDPP-AMDA/ARTEMIS/P1/Models.xml b/Instrument/CDPP-AMDA/ARTEMIS/P1/Models.xml
index 52a470d..557283f 100644
--- a/Instrument/CDPP-AMDA/ARTEMIS/P1/Models.xml
+++ b/Instrument/CDPP-AMDA/ARTEMIS/P1/Models.xml
@@ -8,7 +8,7 @@
       <ReleaseDate>2017-02-04T15:37:46Z</ReleaseDate>
       <Description/>
       <Contact>
-        <PersonID>spase://CNES/Person/Christian.Jacquey</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Christian.Jacquey</PersonID>
         <Role>TechnicalContact</Role>
       </Contact>
     </ResourceHeader>
diff --git a/Instrument/CDPP-AMDA/ARTEMIS/P2/Models.xml b/Instrument/CDPP-AMDA/ARTEMIS/P2/Models.xml
index fd0d0a5..5ec1eb7 100644
--- a/Instrument/CDPP-AMDA/ARTEMIS/P2/Models.xml
+++ b/Instrument/CDPP-AMDA/ARTEMIS/P2/Models.xml
@@ -8,7 +8,7 @@
       <ReleaseDate>2017-02-04T15:37:46Z</ReleaseDate>
       <Description/>
       <Contact>
-        <PersonID>spase://CNES/Person/Christian.Jacquey</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Christian.Jacquey</PersonID>
         <Role>TechnicalContact</Role>
       </Contact>
     </ResourceHeader>
diff --git a/Instrument/CDPP-AMDA/Bepi/Ephemeris.xml b/Instrument/CDPP-AMDA/Bepi/Ephemeris.xml
index b689991..adaafdb 100644
--- a/Instrument/CDPP-AMDA/Bepi/Ephemeris.xml
+++ b/Instrument/CDPP-AMDA/Bepi/Ephemeris.xml
@@ -10,7 +10,7 @@
       <Description>Bepi Ephemeris are calculated in IRAP by using BepiColombo SPICE kernels</Description>
       <Acknowledgement/>
        <Contact>       
-         <PersonID>spase://CNES/Person/Marc.Sitja</PersonID> 
+         <PersonID>spase://CNES/Person/CDPP-AMDA/Marc.Sitja</PersonID> 
          <Role>PrincipalInvestigator</Role>
        </Contact>               
       <PriorID/>
diff --git a/Instrument/CDPP-AMDA/Bepi/MEA1.xml b/Instrument/CDPP-AMDA/Bepi/MEA1.xml
index 834e93e..3d9a780 100644
--- a/Instrument/CDPP-AMDA/Bepi/MEA1.xml
+++ b/Instrument/CDPP-AMDA/Bepi/MEA1.xml
@@ -13,11 +13,11 @@
       The Mercury Electron Analyzers have been developed at IRAP with the support of CNES.</Description>
       <Acknowledgement/>
        <Contact>       
-         <PersonID>spase://CNES/Person/Yoshifumi.Saito</PersonID> 
+         <PersonID>spase://CNES/Person/CDPP-AMDA/Yoshifumi.Saito</PersonID> 
          <Role>PrincipalInvestigator</Role>
        </Contact>   
       <Contact>       
-        <PersonID>spase://CNES/Person/Nicolas.Andre</PersonID> 
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Nicolas.Andre</PersonID> 
         <Role>CoInvestigator</Role>
       </Contact> 
       <PriorID/>
diff --git a/Instrument/CDPP-AMDA/Bepi/MEA2.xml b/Instrument/CDPP-AMDA/Bepi/MEA2.xml
index 0a6cfa1..356f71c 100644
--- a/Instrument/CDPP-AMDA/Bepi/MEA2.xml
+++ b/Instrument/CDPP-AMDA/Bepi/MEA2.xml
@@ -13,11 +13,11 @@
       The Mercury Electron Analyzers have been developed at IRAP with the support of CNES.</Description>
       <Acknowledgement/>
        <Contact>       
-         <PersonID>spase://CNES/Person/Yoshifumi.Saito</PersonID> 
+         <PersonID>spase://CNES/Person/CDPP-AMDA/Yoshifumi.Saito</PersonID> 
          <Role>PrincipalInvestigator</Role>
        </Contact> 
       <Contact>       
-        <PersonID>spase://CNES/Person/Nicolas.Andre</PersonID> 
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Nicolas.Andre</PersonID> 
         <Role>CoInvestigator</Role>
       </Contact> 
       <PriorID/>
diff --git a/Instrument/CDPP-AMDA/Bepi/MIA.xml b/Instrument/CDPP-AMDA/Bepi/MIA.xml
index 49d8012..7584f2f 100644
--- a/Instrument/CDPP-AMDA/Bepi/MIA.xml
+++ b/Instrument/CDPP-AMDA/Bepi/MIA.xml
@@ -10,7 +10,7 @@
       <Description>ToDo</Description>
       <Acknowledgement/>
        <Contact>       
-         <PersonID>spase://CNES/Person/Yoshifumi.Saito</PersonID> 
+         <PersonID>spase://CNES/Person/CDPP-AMDA/Yoshifumi.Saito</PersonID> 
          <Role>PrincipalInvestigator</Role>
        </Contact>   
       <PriorID/>
diff --git a/Instrument/CDPP-AMDA/Bepi/MPO-MAG.xml b/Instrument/CDPP-AMDA/Bepi/MPO-MAG.xml
index 69e278d..154b78d 100644
--- a/Instrument/CDPP-AMDA/Bepi/MPO-MAG.xml
+++ b/Instrument/CDPP-AMDA/Bepi/MPO-MAG.xml
@@ -29,11 +29,11 @@
         due to magnetospheric processes. </Description>
       <Acknowledgement/>
        <Contact>       
-         <PersonID>spase://CNES/Person/Daniel.Heyner</PersonID> 
+         <PersonID>spase://CNES/Person/CDPP-AMDA/Daniel.Heyner</PersonID> 
          <Role>PrincipalInvestigator</Role>
        </Contact>   
       <Contact>       
-        <PersonID>spase://CNES/Person/C.Carr</PersonID> 
+        <PersonID>spase://CNES/Person/CDPP-AMDA/C.Carr</PersonID> 
         <Role>CoInvestigator</Role>
       </Contact>
       <PriorID/>
diff --git a/Instrument/CDPP-AMDA/Cassini/CAPS.xml b/Instrument/CDPP-AMDA/Cassini/CAPS.xml
index 930676c..adca7fd 100644
--- a/Instrument/CDPP-AMDA/Cassini/CAPS.xml
+++ b/Instrument/CDPP-AMDA/Cassini/CAPS.xml
@@ -13,7 +13,7 @@
 * the Ion Mass Spectrometer (IMS), which provides species-resolved measurements of the flux of positively charged atomic and molecular ions as a function of energy/charge vs. aperture entrydirection. Its energy range is 1 eV to 50 keV. </Description>
       <Acknowledgement/>
       <Contact>
-        <PersonID>spase://CNES/Person/J.Waite</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/J.Waite</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>
       <InformationURL>
diff --git a/Instrument/CDPP-AMDA/Cassini/Ephemeris.xml b/Instrument/CDPP-AMDA/Cassini/Ephemeris.xml
index c9a55bf..b25372a 100644
--- a/Instrument/CDPP-AMDA/Cassini/Ephemeris.xml
+++ b/Instrument/CDPP-AMDA/Cassini/Ephemeris.xml
@@ -13,7 +13,7 @@
         </Description>
       <Acknowledgement/>
       <Contact>       
-        <PersonID>spase://CNES/Person/NAIF</PersonID> 
+        <PersonID>spase://CNES/Person/CDPP-AMDA/NAIF</PersonID> 
         <Role>PrincipalInvestigator</Role>
       </Contact>
       <Contact>       
diff --git a/Instrument/CDPP-AMDA/Cassini/MAG.xml b/Instrument/CDPP-AMDA/Cassini/MAG.xml
index b37b50b..d538aee 100644
--- a/Instrument/CDPP-AMDA/Cassini/MAG.xml
+++ b/Instrument/CDPP-AMDA/Cassini/MAG.xml
@@ -20,7 +20,7 @@
         orbiter's spacecraft body.</Description>
       <Acknowledgement/>
       <Contact>
-        <PersonID>spase://CNES/Person/Michele.Dougherty</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Michele.Dougherty</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>
       <InformationURL>
diff --git a/Instrument/CDPP-AMDA/Cassini/Moons_Ephemeris.xml b/Instrument/CDPP-AMDA/Cassini/Moons_Ephemeris.xml
index c234f4b..9e72eca 100644
--- a/Instrument/CDPP-AMDA/Cassini/Moons_Ephemeris.xml
+++ b/Instrument/CDPP-AMDA/Cassini/Moons_Ephemeris.xml
@@ -10,7 +10,7 @@
       <Description>Ephemeris for Saturn moons, some special coordinate systems. 'Regular' ephemeris are in "Astronomical Objects Ephemerides, Saturn Moons" </Description>
       <Acknowledgement/>
        <Contact>       
-        <PersonID>spase://CNES/Person/NAIF</PersonID> 
+        <PersonID>spase://CNES/Person/CDPP-AMDA/NAIF</PersonID> 
         <Role>PrincipalInvestigator</Role>
       </Contact>
       <Contact>       
diff --git a/Instrument/CDPP-AMDA/Cluster1/CIS-CODIF.xml b/Instrument/CDPP-AMDA/Cluster1/CIS-CODIF.xml
index b9d60ac..9c9c92e 100644
--- a/Instrument/CDPP-AMDA/Cluster1/CIS-CODIF.xml
+++ b/Instrument/CDPP-AMDA/Cluster1/CIS-CODIF.xml
@@ -9,7 +9,7 @@
       <ReleaseDate>2011-02-04T15:37:46Z</ReleaseDate>
       <Description>This instrument (CIS: Cluster Ion Spectrometry) is capable of obtaining full 3D ion distributions with high time resolution (in one spacecraft spin) and mass-per-charge resolution. The experiment consists of two different instruments, a Hot Ion Analyzer (HIA) and a time-of-flight Ion Composition and Distribution Function analyzer (CODIF). Extensive on-board processing is done, within its dual-processor Data Processing System (DPS). CODIF determines the distributions of the major ion species with energies from spacecraft potential to 40 KeV/charge with an angular resolution of 22.5 x 10.25 degrees and with two different sensitivities. The CODIF instrument uses electrostatic deflection to select by energy per charge, with subsequent time-of-flight analysis. The sensor primarily covers the energy range 0.02--40 KeV/charge, but with additional pre-acceleration for energies below 25 eV/charge, the range is extended to energies as low as the spacecraft potential. The HIA does not measure mass, but extends the dynamic range to the highest ion fluxes, and has angular resolution capability of 5.6 x 5.6 degrees for ion-beam and solar-wind measurements. The HIA is a symmetric quadrispherical analyzer of top-hat geometry, and uses microchannel-plate electron multipliers and position encoding by discrete anodes. A 2D distribution is obtained once per 62.5 ms, and a full 3D distribution of ions in the energy range ~5 eV/charge to 32 KeV/charge is obtained every 4 s. For more details of the Cluster mission, the spacecraft, and its instruments, see the report ``Cluster: mission, payload and supporting activities,'' March 1993, ESA SP-1159, and the included article ``The Cluster Ion Spectrometry Experiment,'' by H. Reme et al., from which this information was obtained.</Description>
       <Contact>
-        <PersonID>spase://CNES/Person/Jannis.Dandouras</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Jannis.Dandouras</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>
       <InformationURL>
diff --git a/Instrument/CDPP-AMDA/Cluster1/CIS-HIA.xml b/Instrument/CDPP-AMDA/Cluster1/CIS-HIA.xml
index ada461f..d2b20df 100644
--- a/Instrument/CDPP-AMDA/Cluster1/CIS-HIA.xml
+++ b/Instrument/CDPP-AMDA/Cluster1/CIS-HIA.xml
@@ -10,7 +10,7 @@
       <Description>The HIA is a symmetric quadrispherical analyzer of top-hat geometry, and uses microchannel-plate electron multipliers and position encoding by discrete anodes. A 2D distribution is obtained once per 62.5 ms, and a full 3D distribution of ions in the energy range ~5 eV/charge to 32 KeV/charge is obtained every 4 s. For more details of the Cluster mission, the spacecraft, and its instruments, see the report ``Cluster: mission, payload and supporting activities,'' March 1993, ESA SP-1159, and the included article ``The Cluster Ion Spectrometry Experiment,'' by H. Reme et al., from which this information was obtained.</Description>
       <Acknowledgement>Principal Investigator: Iannis Dandouras</Acknowledgement>
       <Contact>
-        <PersonID>spase://CNES/Person/Jannis.Dandouras</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Jannis.Dandouras</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>
       <InformationURL>
diff --git a/Instrument/CDPP-AMDA/Cluster1/EFW.xml b/Instrument/CDPP-AMDA/Cluster1/EFW.xml
index 9627723..d6852bc 100644
--- a/Instrument/CDPP-AMDA/Cluster1/EFW.xml
+++ b/Instrument/CDPP-AMDA/Cluster1/EFW.xml
@@ -10,7 +10,7 @@
       <Description>The EFW (Electric Field and Waves) instrument consists of four orthogonal spherical sensors deployed from 50 m cable booms in the spin plane of the spacecraft, plus four deployment units and a main electronics unit. Each deployment unit deploys a multiconductor cable and tip-mounted spherical sensor. Each opposing pair of cables will be symmetrically deployed to a tip-to-tip distance of approximately 100 m, except for about a week at the beginning of the mission when 70 m will be used for one boom pair (the Z-booms) and 100 m for the other pair. The potentials of the spherical sensor and nearby conductors are controlled by the microprocessor to minimize errors associated with photoelectron fluxes to and from the spheres.  
       </Description>
       <Contact>
-        <PersonID>spase://CNES/Person/Mats.Andre</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Mats.Andre</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>
       <InformationURL>
diff --git a/Instrument/CDPP-AMDA/Cluster1/Ephemeris.xml b/Instrument/CDPP-AMDA/Cluster1/Ephemeris.xml
index 6ff7f27..74b6070 100644
--- a/Instrument/CDPP-AMDA/Cluster1/Ephemeris.xml
+++ b/Instrument/CDPP-AMDA/Cluster1/Ephemeris.xml
@@ -9,7 +9,7 @@
       <ReleaseDate>2017-02-04T15:37:46Z</ReleaseDate>
       <Description>Cluster 1 spacecraft positions in various coordinate systems</Description>
       <Contact>
-        <PersonID>spase://CNES/Person/Elena.Budnik</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Elena.Budnik</PersonID>
         <Role>TechnicalContact</Role>
       </Contact>
       <PriorID>spase://SMWG/Instrument/Cluster2-Rumba/Ephemeris</PriorID>
diff --git a/Instrument/CDPP-AMDA/Cluster1/Models.xml b/Instrument/CDPP-AMDA/Cluster1/Models.xml
index 9158e1f..31689f1 100644
--- a/Instrument/CDPP-AMDA/Cluster1/Models.xml
+++ b/Instrument/CDPP-AMDA/Cluster1/Models.xml
@@ -9,7 +9,7 @@
       <ReleaseDate>2017-02-04T15:37:46Z</ReleaseDate>
       <Description/>
       <Contact>
-        <PersonID>spase://CNES/Person/Christian.Jacquey</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Christian.Jacquey</PersonID>
         <Role>TechnicalContact</Role>
       </Contact>
     </ResourceHeader>
diff --git a/Instrument/CDPP-AMDA/Cluster1/WHISPER.xml b/Instrument/CDPP-AMDA/Cluster1/WHISPER.xml
index a276196..8636b5b 100644
--- a/Instrument/CDPP-AMDA/Cluster1/WHISPER.xml
+++ b/Instrument/CDPP-AMDA/Cluster1/WHISPER.xml
@@ -19,7 +19,7 @@
         * command and data processing systems, which are part of the DWP experiment.</Description>
        <Acknowledgement>Principal Investigator: Jean-Louis Rauch</Acknowledgement>
        <Contact>
-        <PersonID>spase://CNES/Person/Jean-Louis.Rauch</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Jean-Louis.Rauch</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>
       <InformationURL>
diff --git a/Instrument/CDPP-AMDA/Cluster2/EFW.xml b/Instrument/CDPP-AMDA/Cluster2/EFW.xml
index d90b026..bb24c95 100644
--- a/Instrument/CDPP-AMDA/Cluster2/EFW.xml
+++ b/Instrument/CDPP-AMDA/Cluster2/EFW.xml
@@ -10,7 +10,7 @@
       <Description>The EFW (Electric Field and Waves) instrument consists of four orthogonal spherical sensors deployed from 50 m cable booms in the spin plane of the spacecraft, plus four deployment units and a main electronics unit. Each deployment unit deploys a multiconductor cable and tip-mounted spherical sensor. Each opposing pair of cables will be symmetrically deployed to a tip-to-tip distance of approximately 100 m, except for about a week at the beginning of the mission when 70 m will be used for one boom pair (the Z-booms) and 100 m for the other pair. The potentials of the spherical sensor and nearby conductors are controlled by the microprocessor to minimize errors associated with photoelectron fluxes to and from the spheres.  
       </Description>
       <Contact>
-        <PersonID>spase://CNES/Person/Mats.Andre</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Mats.Andre</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>
       <InformationURL>
diff --git a/Instrument/CDPP-AMDA/Cluster2/Ephemeris.xml b/Instrument/CDPP-AMDA/Cluster2/Ephemeris.xml
index 7cb5822..dd4dc30 100644
--- a/Instrument/CDPP-AMDA/Cluster2/Ephemeris.xml
+++ b/Instrument/CDPP-AMDA/Cluster2/Ephemeris.xml
@@ -9,7 +9,7 @@
       <ReleaseDate>2017-02-04T15:37:33Z</ReleaseDate>
       <Description>Cluster 2 spacecraft positions in various coordinate systems</Description>
       <Contact>
-        <PersonID>spase://CNES/Person/Elena.Budnik</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Elena.Budnik</PersonID>
         <Role>TechnicalContact</Role>
       </Contact>
       <PriorID>spase://SMWG/Instrument/Cluster2-Salsa/Ephemeris</PriorID>
diff --git a/Instrument/CDPP-AMDA/Cluster2/Models.xml b/Instrument/CDPP-AMDA/Cluster2/Models.xml
index 8d00745..34c5f62 100644
--- a/Instrument/CDPP-AMDA/Cluster2/Models.xml
+++ b/Instrument/CDPP-AMDA/Cluster2/Models.xml
@@ -8,7 +8,7 @@
       <ReleaseDate>2017-02-04T15:37:46Z</ReleaseDate>
       <Description/>
       <Contact>
-        <PersonID>spase://CNES/Person/Christian.Jacquey</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Christian.Jacquey</PersonID>
         <Role>TechnicalContact</Role>
       </Contact>
     </ResourceHeader>
diff --git a/Instrument/CDPP-AMDA/Cluster2/WHISPER.xml b/Instrument/CDPP-AMDA/Cluster2/WHISPER.xml
index 5d9faa6..fdcfacc 100644
--- a/Instrument/CDPP-AMDA/Cluster2/WHISPER.xml
+++ b/Instrument/CDPP-AMDA/Cluster2/WHISPER.xml
@@ -19,7 +19,7 @@
         * command and data processing systems, which are part of the DWP experiment.</Description>
        <Acknowledgement>Principal Investigator: Jean-Louis Rauch</Acknowledgement>
        <Contact>
-        <PersonID>spase://CNES/Person/Jean-Louis.Rauch</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Jean-Louis.Rauch</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>
       <InformationURL>
diff --git a/Instrument/CDPP-AMDA/Cluster3/CIS-CODIF.xml b/Instrument/CDPP-AMDA/Cluster3/CIS-CODIF.xml
index 00baf76..0503f81 100644
--- a/Instrument/CDPP-AMDA/Cluster3/CIS-CODIF.xml
+++ b/Instrument/CDPP-AMDA/Cluster3/CIS-CODIF.xml
@@ -9,7 +9,7 @@
       <ReleaseDate>2011-02-04T15:37:07Z</ReleaseDate>
       <Description>This instrument (CIS: Cluster Ion Spectrometry) is capable of obtaining full 3D ion distributions with high time resolution (in one spacecraft spin) and mass-per-charge resolution. The experiment consists of two different instruments, a Hot Ion Analyzer (HIA) and a time-of-flight Ion Composition and Distribution Function analyzer (CODIF). Extensive on-board processing is done, within its dual-processor Data Processing System (DPS). CODIF determines the distributions of the major ion species with energies from spacecraft potential to 40 KeV/charge with an angular resolution of 22.5 x 10.25 degrees and with two different sensitivities. The CODIF instrument uses electrostatic deflection to select by energy per charge, with subsequent time-of-flight analysis. The sensor primarily covers the energy range 0.02--40 KeV/charge, but with additional pre-acceleration for energies below 25 eV/charge, the range is extended to energies as low as the spacecraft potential. The HIA does not measure mass, but extends the dynamic range to the highest ion fluxes, and has angular resolution capability of 5.6 x 5.6 degrees for ion-beam and solar-wind measurements. The HIA is a symmetric quadrispherical analyzer of top-hat geometry, and uses microchannel-plate electron multipliers and position encoding by discrete anodes. A 2D distribution is obtained once per 62.5 ms, and a full 3D distribution of ions in the energy range ~5 eV/charge to 32 KeV/charge is obtained every 4 s. For more details of the Cluster mission, the spacecraft, and its instruments, see the report ``Cluster: mission, payload and supporting activities,'' March 1993, ESA SP-1159, and the included article ``The Cluster Ion Spectrometry Experiment,'' by H. Reme et al., from which this information was obtained.</Description>
       <Contact>
-        <PersonID>spase://CNES/Person/Jannis.Dandouras</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Jannis.Dandouras</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>
       <InformationURL>
diff --git a/Instrument/CDPP-AMDA/Cluster3/CIS-HIA.xml b/Instrument/CDPP-AMDA/Cluster3/CIS-HIA.xml
index 054192a..89d9f4d 100644
--- a/Instrument/CDPP-AMDA/Cluster3/CIS-HIA.xml
+++ b/Instrument/CDPP-AMDA/Cluster3/CIS-HIA.xml
@@ -10,7 +10,7 @@
       <Description>The HIA is a symmetric quadrispherical analyzer of top-hat geometry, and uses microchannel-plate electron multipliers and position encoding by discrete anodes. A 2D distribution is obtained once per 62.5 ms, and a full 3D distribution of ions in the energy range ~5 eV/charge to 32 KeV/charge is obtained every 4 s. For more details of the Cluster mission, the spacecraft, and its instruments, see the report ``Cluster: mission, payload and supporting activities,'' March 1993, ESA SP-1159, and the included article ``The Cluster Ion Spectrometry Experiment,'' by H. Reme et al., from which this information was obtained.</Description>
       <Acknowledgement>Principal Investigator: Iannis Dandouras</Acknowledgement>
       <Contact>
-        <PersonID>spase://CNES/Person/Jannis.Dandouras</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Jannis.Dandouras</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>
       <InformationURL>
diff --git a/Instrument/CDPP-AMDA/Cluster3/EFW.xml b/Instrument/CDPP-AMDA/Cluster3/EFW.xml
index 68ca03b..6ed9b11 100644
--- a/Instrument/CDPP-AMDA/Cluster3/EFW.xml
+++ b/Instrument/CDPP-AMDA/Cluster3/EFW.xml
@@ -10,7 +10,7 @@
       <Description>The EFW (Electric Field and Waves) instrument consists of four orthogonal spherical sensors deployed from 50 m cable booms in the spin plane of the spacecraft, plus four deployment units and a main electronics unit. Each deployment unit deploys a multiconductor cable and tip-mounted spherical sensor. Each opposing pair of cables will be symmetrically deployed to a tip-to-tip distance of approximately 100 m, except for about a week at the beginning of the mission when 70 m will be used for one boom pair (the Z-booms) and 100 m for the other pair. The potentials of the spherical sensor and nearby conductors are controlled by the microprocessor to minimize errors associated with photoelectron fluxes to and from the spheres.  
       </Description>
       <Contact>
-        <PersonID>spase://CNES/Person/Mats.Andre</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Mats.Andre</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>
       <InformationURL>
diff --git a/Instrument/CDPP-AMDA/Cluster3/Ephemeris.xml b/Instrument/CDPP-AMDA/Cluster3/Ephemeris.xml
index daa512e..d5b337b 100644
--- a/Instrument/CDPP-AMDA/Cluster3/Ephemeris.xml
+++ b/Instrument/CDPP-AMDA/Cluster3/Ephemeris.xml
@@ -9,7 +9,7 @@
       <ReleaseDate>2017-02-04T15:37:07Z</ReleaseDate>
       <Description>Cluster 3 spacecraft positions in various coordinate systems</Description>
       <Contact>
-        <PersonID>spase://CNES/Person/Elena.Budnik</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Elena.Budnik</PersonID>
         <Role>TechnicalContact</Role>
       </Contact>
       <PriorID>spase://SMWG/Instrument/Cluster2-Samba/Ephemeris</PriorID>
diff --git a/Instrument/CDPP-AMDA/Cluster3/Models.xml b/Instrument/CDPP-AMDA/Cluster3/Models.xml
index fdcd683..5542f6d 100644
--- a/Instrument/CDPP-AMDA/Cluster3/Models.xml
+++ b/Instrument/CDPP-AMDA/Cluster3/Models.xml
@@ -8,7 +8,7 @@
       <ReleaseDate>2017-02-04T15:37:46Z</ReleaseDate>
       <Description/>
       <Contact>
-        <PersonID>spase://CNES/Person/Christian.Jacquey</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Christian.Jacquey</PersonID>
         <Role>TechnicalContact</Role>
       </Contact>
     </ResourceHeader>
diff --git a/Instrument/CDPP-AMDA/Cluster3/WHISPER.xml b/Instrument/CDPP-AMDA/Cluster3/WHISPER.xml
index 4c5332a..51207d1 100644
--- a/Instrument/CDPP-AMDA/Cluster3/WHISPER.xml
+++ b/Instrument/CDPP-AMDA/Cluster3/WHISPER.xml
@@ -19,7 +19,7 @@
         * command and data processing systems, which are part of the DWP experiment.</Description>
        <Acknowledgement>Principal Investigator: Jean-Louis Rauch</Acknowledgement>
        <Contact>
-        <PersonID>spase://CNES/Person/Jean-Louis.Rauch</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Jean-Louis.Rauch</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>
       <InformationURL>
diff --git a/Instrument/CDPP-AMDA/Cluster4/CIS-CODIF.xml b/Instrument/CDPP-AMDA/Cluster4/CIS-CODIF.xml
index d0f6b86..f24402b 100644
--- a/Instrument/CDPP-AMDA/Cluster4/CIS-CODIF.xml
+++ b/Instrument/CDPP-AMDA/Cluster4/CIS-CODIF.xml
@@ -9,7 +9,7 @@
       <ReleaseDate>2011-02-04T15:37:19Z</ReleaseDate>
       <Description>This instrument (CIS: Cluster Ion Spectrometry) is capable of obtaining full 3D ion distributions with high time resolution (in one spacecraft spin) and mass-per-charge resolution. The experiment consists of two different instruments, a Hot Ion Analyzer (HIA) and a time-of-flight Ion Composition and Distribution Function analyzer (CODIF). Extensive on-board processing is done, within its dual-processor Data Processing System (DPS). CODIF determines the distributions of the major ion species with energies from spacecraft potential to 40 KeV/charge with an angular resolution of 22.5 x 10.25 degrees and with two different sensitivities. The CODIF instrument uses electrostatic deflection to select by energy per charge, with subsequent time-of-flight analysis. The sensor primarily covers the energy range 0.02--40 KeV/charge, but with additional pre-acceleration for energies below 25 eV/charge, the range is extended to energies as low as the spacecraft potential. The HIA does not measure mass, but extends the dynamic range to the highest ion fluxes, and has angular resolution capability of 5.6 x 5.6 degrees for ion-beam and solar-wind measurements. The HIA is a symmetric quadrispherical analyzer of top-hat geometry, and uses microchannel-plate electron multipliers and position encoding by discrete anodes. A 2D distribution is obtained once per 62.5 ms, and a full 3D distribution of ions in the energy range ~5 eV/charge to 32 KeV/charge is obtained every 4 s. For more details of the Cluster mission, the spacecraft, and its instruments, see the report ``Cluster: mission, payload and supporting activities,'' March 1993, ESA SP-1159, and the included article ``The Cluster Ion Spectrometry Experiment,'' by H. Reme et al., from which this information was obtained.</Description>
       <Contact>
-         <PersonID>spase://CNES/Person/Jannis.Dandouras</PersonID>
+         <PersonID>spase://CNES/Person/CDPP-AMDA/Jannis.Dandouras</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>
       <InformationURL>
diff --git a/Instrument/CDPP-AMDA/Cluster4/EFW.xml b/Instrument/CDPP-AMDA/Cluster4/EFW.xml
index 484347a..1800f30 100644
--- a/Instrument/CDPP-AMDA/Cluster4/EFW.xml
+++ b/Instrument/CDPP-AMDA/Cluster4/EFW.xml
@@ -10,7 +10,7 @@
       <Description>The EFW (Electric Field and Waves) instrument consists of four orthogonal spherical sensors deployed from 50 m cable booms in the spin plane of the spacecraft, plus four deployment units and a main electronics unit. Each deployment unit deploys a multiconductor cable and tip-mounted spherical sensor. Each opposing pair of cables will be symmetrically deployed to a tip-to-tip distance of approximately 100 m, except for about a week at the beginning of the mission when 70 m will be used for one boom pair (the Z-booms) and 100 m for the other pair. The potentials of the spherical sensor and nearby conductors are controlled by the microprocessor to minimize errors associated with photoelectron fluxes to and from the spheres.  
       </Description>
       <Contact>
-        <PersonID>spase://CNES/Person/Mats.Andre</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Mats.Andre</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>
       <InformationURL>
diff --git a/Instrument/CDPP-AMDA/Cluster4/Ephemeris.xml b/Instrument/CDPP-AMDA/Cluster4/Ephemeris.xml
index 2f341c5..49469c8 100644
--- a/Instrument/CDPP-AMDA/Cluster4/Ephemeris.xml
+++ b/Instrument/CDPP-AMDA/Cluster4/Ephemeris.xml
@@ -9,7 +9,7 @@
       <ReleaseDate>2017-02-04T15:37:19Z</ReleaseDate>
       <Description>Cluster 4 spacecraft positions in various coordinate systems</Description>
       <Contact>
-        <PersonID>spase://CNES/Person/Elena.Budnik</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Elena.Budnik</PersonID>
         <Role>TechnicalContact</Role>
       </Contact>
       <PriorID>spase://SMWG/Instrument/Cluster2-Tango/Ephemeris</PriorID>
diff --git a/Instrument/CDPP-AMDA/Cluster4/Models.xml b/Instrument/CDPP-AMDA/Cluster4/Models.xml
index 0803db8..427553d 100644
--- a/Instrument/CDPP-AMDA/Cluster4/Models.xml
+++ b/Instrument/CDPP-AMDA/Cluster4/Models.xml
@@ -8,7 +8,7 @@
       <ReleaseDate>2017-02-04T15:37:46Z</ReleaseDate>
       <Description/>
       <Contact>
-        <PersonID>spase://CNES/Person/Christian.Jacquey</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Christian.Jacquey</PersonID>
         <Role>TechnicalContact</Role>
       </Contact>
     </ResourceHeader>
diff --git a/Instrument/CDPP-AMDA/Cluster4/WHISPER.xml b/Instrument/CDPP-AMDA/Cluster4/WHISPER.xml
index 1c7473b..4c470e7 100644
--- a/Instrument/CDPP-AMDA/Cluster4/WHISPER.xml
+++ b/Instrument/CDPP-AMDA/Cluster4/WHISPER.xml
@@ -19,7 +19,7 @@
         * command and data processing systems, which are part of the DWP experiment.</Description>
        <Acknowledgement>Principal Investigator: Jean-Louis Rauch</Acknowledgement>
        <Contact>
-        <PersonID>spase://CNES/Person/Jean-Louis.Rauch</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Jean-Louis.Rauch</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>
       <InformationURL>
diff --git a/Instrument/CDPP-AMDA/Comets.xml b/Instrument/CDPP-AMDA/Comets.xml
index d304c45..bc65041 100644
--- a/Instrument/CDPP-AMDA/Comets.xml
+++ b/Instrument/CDPP-AMDA/Comets.xml
@@ -8,7 +8,7 @@
       <ReleaseDate>2009-05-20T21:10:13Z</ReleaseDate>
       <Description></Description>
       <Contact>       
-        <PersonID>spase://CNES/Person/NAIF</PersonID> 
+        <PersonID>spase://CNES/Person/CDPP-AMDA/NAIF</PersonID> 
         <Role>PrincipalInvestigator</Role>
       </Contact>
     </ResourceHeader>
diff --git a/Instrument/CDPP-AMDA/DSCOVR/Ephemeris.xml b/Instrument/CDPP-AMDA/DSCOVR/Ephemeris.xml
index ab138cb..61f5e57 100644
--- a/Instrument/CDPP-AMDA/DSCOVR/Ephemeris.xml
+++ b/Instrument/CDPP-AMDA/DSCOVR/Ephemeris.xml
@@ -10,7 +10,7 @@
       <Description/>     
       <Acknowledgement>NOAA Space Weather Prediction Center (2016): Deep Space Climate Observatory (DSCOVR). NOAA National Centers for Environmental Information.</Acknowledgement>
         <Contact>
-                <PersonID>spase://CNES/Person/Doug.Biesecker</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Doug.Biesecker</PersonID>
                 <Role>DataProducer</Role>
           </Contact>        
     </ResourceHeader>
diff --git a/Instrument/CDPP-AMDA/DSCOVR/FC.xml b/Instrument/CDPP-AMDA/DSCOVR/FC.xml
index 5599f85..cf911ff 100644
--- a/Instrument/CDPP-AMDA/DSCOVR/FC.xml
+++ b/Instrument/CDPP-AMDA/DSCOVR/FC.xml
@@ -9,7 +9,7 @@
       <Description></Description>
       <Acknowledgement>NOAA Space Weather Prediction Center (2016): Deep Space Climate Observatory (DSCOVR). NOAA National Centers for Environmental Information.</Acknowledgement>
       <Contact>      
-        <PersonID>spase://CNES/Person/Justin.Kasper</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Justin.Kasper</PersonID>
         <!--<Role>InstrumentLead</Role>-->
         <Role>PrincipalInvestigator</Role>
       </Contact>     
diff --git a/Instrument/CDPP-AMDA/DSCOVR/MAG.xml b/Instrument/CDPP-AMDA/DSCOVR/MAG.xml
index b8e59c6..8fdbe5a 100644
--- a/Instrument/CDPP-AMDA/DSCOVR/MAG.xml
+++ b/Instrument/CDPP-AMDA/DSCOVR/MAG.xml
@@ -13,7 +13,7 @@
 </Description>
       <Acknowledgement>NOAA Space Weather Prediction Center (2016): Deep Space Climate Observatory (DSCOVR). NOAA National Centers for Environmental Information.</Acknowledgement>
       <Contact>      
-        <PersonID>spase://CNES/Person/Adam.Szabo</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Adam.Szabo</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>     
       <InformationURL>
diff --git a/Instrument/CDPP-AMDA/DoubleStar1/HIA.xml b/Instrument/CDPP-AMDA/DoubleStar1/HIA.xml
index 86d137f..69a09b2 100644
--- a/Instrument/CDPP-AMDA/DoubleStar1/HIA.xml
+++ b/Instrument/CDPP-AMDA/DoubleStar1/HIA.xml
@@ -9,7 +9,7 @@
       <ReleaseDate>2009-05-20T21:10:13Z</ReleaseDate>
       <Description>HIA (Hot Ion Analyzer) meausres the distribution function of ions in the magnetosphere and the solar wind, during each spin period of four seconds.</Description>
       <Contact>
-        <PersonID>spase://CNES/Person/Jannis.Dandouras</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Jannis.Dandouras</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>
       <InformationURL>
diff --git a/Instrument/CDPP-AMDA/EISCAT/32M.xml b/Instrument/CDPP-AMDA/EISCAT/32M.xml
index dae39c8..86e4c0f 100644
--- a/Instrument/CDPP-AMDA/EISCAT/32M.xml
+++ b/Instrument/CDPP-AMDA/EISCAT/32M.xml
@@ -10,11 +10,11 @@
       <ReleaseDate>2018-02-04T12:34:56.789</ReleaseDate>
       <Description> EISCAT incoherent scatter radar in Longyearbyen, Svalbard archipelago. Steerable antenna, 32m in diameter. </Description>
      <Contact>       
-        <PersonID>spase://CNES/Person/Assar.Westman</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Assar.Westman</PersonID>
         <Role>Scientist</Role>
      </Contact>
       <Contact>
-      <PersonID>spase://CNES/Person/Craig.Heinselman</PersonID>
+      <PersonID>spase://CNES/Person/CDPP-AMDA/Craig.Heinselman</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>
       <InformationURL>
diff --git a/Instrument/CDPP-AMDA/EISCAT/42M.xml b/Instrument/CDPP-AMDA/EISCAT/42M.xml
index ad5684e..7254348 100644
--- a/Instrument/CDPP-AMDA/EISCAT/42M.xml
+++ b/Instrument/CDPP-AMDA/EISCAT/42M.xml
@@ -10,11 +10,11 @@
       <ReleaseDate>2018-02-04T12:34:56.789</ReleaseDate>
       <Description>EISCAT incoherent scatter radar in Longyearbyen, Svalbard archipelago. field-aligned pointing antenna, 42m in diameter</Description>
        <Contact>       
-        <PersonID>spase://CNES/Person/Assar.Westman</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Assar.Westman</PersonID>
         <Role>Scientist</Role>
        </Contact>
       <Contact>
-	     <PersonID>spase://CNES/Person/Craig.Heinselman</PersonID>
+	     <PersonID>spase://CNES/Person/CDPP-AMDA/Craig.Heinselman</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>
       <InformationURL>
diff --git a/Instrument/CDPP-AMDA/EISCAT/UHF.xml b/Instrument/CDPP-AMDA/EISCAT/UHF.xml
index df5a52e..4252219 100644
--- a/Instrument/CDPP-AMDA/EISCAT/UHF.xml
+++ b/Instrument/CDPP-AMDA/EISCAT/UHF.xml
@@ -10,11 +10,11 @@
       <ReleaseDate>2018-02-04T12:34:56.789</ReleaseDate>
       <Description>EISCAT incoherent scatter radar in Tromso, Norway. Steerable antenna, 32m in diameter.</Description>
       <Contact>       
-        <PersonID>spase://CNES/Person/Mike.Rietveld</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Mike.Rietveld</PersonID>
         <Role>Scientist</Role>
       </Contact>
       <Contact>
-	     <PersonID>spase://CNES/Person/Craig.Heinselman</PersonID>
+	     <PersonID>spase://CNES/Person/CDPP-AMDA/Craig.Heinselman</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>     
       <InformationURL>
diff --git a/Instrument/CDPP-AMDA/EISCAT/VHF.xml b/Instrument/CDPP-AMDA/EISCAT/VHF.xml
index 12f4097..36268ff 100644
--- a/Instrument/CDPP-AMDA/EISCAT/VHF.xml
+++ b/Instrument/CDPP-AMDA/EISCAT/VHF.xml
@@ -10,11 +10,11 @@
       <ReleaseDate>2018-02-04T12:34:56.789</ReleaseDate>
       <Description>EISCAT incoherent scatter radar in Tromso, Norway. Steerable antenna, 120x40m</Description>
       <Contact>       
-        <PersonID>spase://CNES/Person/Mike.Rietveld</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Mike.Rietveld</PersonID>
         <Role>Scientist</Role>
       </Contact>
       <Contact>
-	      <PersonID>spase://CNES/Person/Craig.Heinselman</PersonID>
+	      <PersonID>spase://CNES/Person/CDPP-AMDA/Craig.Heinselman</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact> 
        <InformationURL>
diff --git a/Instrument/CDPP-AMDA/Ephemerides.xml b/Instrument/CDPP-AMDA/Ephemerides.xml
index 3c0f2c0..830980c 100644
--- a/Instrument/CDPP-AMDA/Ephemerides.xml
+++ b/Instrument/CDPP-AMDA/Ephemerides.xml
@@ -8,7 +8,7 @@
       <ReleaseDate>2009-05-20T21:10:13Z</ReleaseDate>
       <Description/>
       <Contact>       
-        <PersonID>spase://CNES/Person/NAIF</PersonID> 
+        <PersonID>spase://CNES/Person/CDPP-AMDA/NAIF</PersonID> 
         <Role>PrincipalInvestigator</Role>
       </Contact>
     </ResourceHeader>
diff --git a/Instrument/CDPP-AMDA/FERMI/LAT.xml b/Instrument/CDPP-AMDA/FERMI/LAT.xml
index 5f63520..d09e49b 100644
--- a/Instrument/CDPP-AMDA/FERMI/LAT.xml
+++ b/Instrument/CDPP-AMDA/FERMI/LAT.xml
@@ -11,7 +11,7 @@
         Such gamma rays are emitted only in the most extreme conditions, by particles moving very nearly at the speed of light. 
         The LAT's field of view covers about 20% of the sky at any time, and it scans continuously, covering the whole sky every three hours</Description>
        <Contact>
-          <PersonID>spase://CNES/Person/Elizabeth.Hays</PersonID>
+          <PersonID>spase://CNES/Person/CDPP-AMDA/Elizabeth.Hays</PersonID>
          <Role>ProjectScientist</Role>      
       </Contact> 
       <InformationURL>
diff --git a/Instrument/CDPP-AMDA/Galileo/Models.xml b/Instrument/CDPP-AMDA/Galileo/Models.xml
index 6451ec2..16a3915 100644
--- a/Instrument/CDPP-AMDA/Galileo/Models.xml
+++ b/Instrument/CDPP-AMDA/Galileo/Models.xml
@@ -10,7 +10,7 @@
       <Description>Different magnetic parameters calculated basing on Khurana's model</Description>
       <Acknowledgement/>
       <Contact>
-        <PersonID>spase://CNES/Person/Krishan.Khurana</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Krishan.Khurana</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>
       <InformationURL>
diff --git a/Instrument/CDPP-AMDA/Galileo/ephemeris.xml b/Instrument/CDPP-AMDA/Galileo/ephemeris.xml
index 9a7fdf5..da21212 100644
--- a/Instrument/CDPP-AMDA/Galileo/ephemeris.xml
+++ b/Instrument/CDPP-AMDA/Galileo/ephemeris.xml
@@ -11,7 +11,7 @@
         Special Galileo Ephemeris are calculated by Joseph Groene tool (University of Iowa). Orbits 
         during Jupiter moons flybys are obtained from NASA/PDS MAG dataset.</Description>
       <Contact>       
-        <PersonID>spase://CNES/Person/NAIF</PersonID> 
+        <PersonID>spase://CNES/Person/CDPP-AMDA/NAIF</PersonID> 
         <Role>PrincipalInvestigator</Role>
       </Contact>
       <Contact>       
diff --git a/Instrument/CDPP-AMDA/Geotail/EPIC.xml b/Instrument/CDPP-AMDA/Geotail/EPIC.xml
index 288742c..b695f58 100644
--- a/Instrument/CDPP-AMDA/Geotail/EPIC.xml
+++ b/Instrument/CDPP-AMDA/Geotail/EPIC.xml
@@ -17,11 +17,11 @@
         <Role>FormerPI</Role>
       </Contact>
       <Contact>
-        <PersonID>spase://CNES/Person/A.T.Lui</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/A.T.Lui</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>
       <Contact>
-        <PersonID>spase://CNES/Person/Stuart.Nyland</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Stuart.Nyland</PersonID>
         <Role>DataProducer</Role>
       </Contact>
       <InformationURL>
diff --git a/Instrument/CDPP-AMDA/Geotail/Models.xml b/Instrument/CDPP-AMDA/Geotail/Models.xml
index e10984c..5d21c37 100644
--- a/Instrument/CDPP-AMDA/Geotail/Models.xml
+++ b/Instrument/CDPP-AMDA/Geotail/Models.xml
@@ -8,7 +8,7 @@
       <ReleaseDate>2017-02-04T15:37:46Z</ReleaseDate>
       <Description/>
       <Contact>
-        <PersonID>spase://CNES/Person/Christian.Jacquey</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Christian.Jacquey</PersonID>
         <Role>TechnicalContact</Role>
       </Contact>
     </ResourceHeader>
diff --git a/Instrument/CDPP-AMDA/Helios1/AUX.xml b/Instrument/CDPP-AMDA/Helios1/AUX.xml
index 5de7db7..46b073f 100644
--- a/Instrument/CDPP-AMDA/Helios1/AUX.xml
+++ b/Instrument/CDPP-AMDA/Helios1/AUX.xml
@@ -10,7 +10,7 @@
       <Description> 
         </Description>
       <Contact>       
-        <PersonID>spase://CNES/Person/David.Stansby</PersonID> 
+        <PersonID>spase://CNES/Person/CDPP-AMDA/David.Stansby</PersonID> 
         <Role>DataProducer</Role>
       </Contact>
     </ResourceHeader>
diff --git a/Instrument/CDPP-AMDA/Helios1/E1.xml b/Instrument/CDPP-AMDA/Helios1/E1.xml
index e00625a..dbea77b 100644
--- a/Instrument/CDPP-AMDA/Helios1/E1.xml
+++ b/Instrument/CDPP-AMDA/Helios1/E1.xml
@@ -20,11 +20,11 @@
         * The I3 instrument measures positive ions. It can select for m/q and velocity.
         </Description>
        <Contact>      
-        <PersonID>spase://CNES/Person/Rosenbauer</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Rosenbauer</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>
       <Contact>      
-        <PersonID>spase://CNES/Person/Schwenn</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Schwenn</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>
     </ResourceHeader>
diff --git a/Instrument/CDPP-AMDA/Helios1/E3.xml b/Instrument/CDPP-AMDA/Helios1/E3.xml
index 7d860fd..397fc29 100644
--- a/Instrument/CDPP-AMDA/Helios1/E3.xml
+++ b/Instrument/CDPP-AMDA/Helios1/E3.xml
@@ -16,7 +16,7 @@
         At lower bit rates, averages and variances were computed on board for transmission to earth. 
         </Description>
        <Contact>      
-        <PersonID>spase://CNES/Person/Norman.F.Ness</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Norman.F.Ness</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>  
     </ResourceHeader>
diff --git a/Instrument/CDPP-AMDA/Helios1/Ephemeris.xml b/Instrument/CDPP-AMDA/Helios1/Ephemeris.xml
index 55cc90b..b14eeb2 100644
--- a/Instrument/CDPP-AMDA/Helios1/Ephemeris.xml
+++ b/Instrument/CDPP-AMDA/Helios1/Ephemeris.xml
@@ -9,7 +9,7 @@
       <ReleaseDate>2018-10-20T21:10:13Z</ReleaseDate>
       <Description>Helios1 Ephemeris data are calculated using SPICE kernels taken from the  https://naif.jpl.nasa.gov/pub/naif/HELIOS/kernels</Description>
       <Contact>      
-        <PersonID>spase://CNES/Person/Elena.Budnik</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Elena.Budnik</PersonID>
         <Role>TechnicalContact</Role>
       </Contact>
     </ResourceHeader>
diff --git a/Instrument/CDPP-AMDA/Helios1/MAG.xml b/Instrument/CDPP-AMDA/Helios1/MAG.xml
index 76f5237..cab3a7b 100644
--- a/Instrument/CDPP-AMDA/Helios1/MAG.xml
+++ b/Instrument/CDPP-AMDA/Helios1/MAG.xml
@@ -31,11 +31,11 @@ E3 :  The Rome‐GSFC magnetic field experiment utilized a triaxial fluxg
 magnetometer. 
         </Description> 
       <Contact>      
-        <PersonID>spase://CNES/Person/Musmann</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Musmann</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>
       <Contact>      
-        <PersonID>spase://CNES/Person/Mariani</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Mariani</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>
       <Contact>      
@@ -43,7 +43,7 @@ magnetometer. 
         <Role>PrincipalInvestigator</Role>
       </Contact>
       <Contact>      
-        <PersonID>spase://CNES/Person/F.M.Neubauer</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/F.M.Neubauer</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>
     </ResourceHeader>
diff --git a/Instrument/CDPP-AMDA/Helios2/AUX.xml b/Instrument/CDPP-AMDA/Helios2/AUX.xml
index f12de4d..abe8b3e 100644
--- a/Instrument/CDPP-AMDA/Helios2/AUX.xml
+++ b/Instrument/CDPP-AMDA/Helios2/AUX.xml
@@ -10,7 +10,7 @@
       <Description> 
         </Description>
       <Contact>       
-        <PersonID>spase://CNES/Person/David.Stansby</PersonID> 
+        <PersonID>spase://CNES/Person/CDPP-AMDA/David.Stansby</PersonID> 
         <Role>DataProducer</Role>
       </Contact>
     </ResourceHeader>
diff --git a/Instrument/CDPP-AMDA/Helios2/E1.xml b/Instrument/CDPP-AMDA/Helios2/E1.xml
index 5719ff7..c09cde6 100644
--- a/Instrument/CDPP-AMDA/Helios2/E1.xml
+++ b/Instrument/CDPP-AMDA/Helios2/E1.xml
@@ -19,11 +19,11 @@
         * The I2 instrument measures electrons. It can run in two different modes (A or B), toggled by manual commands sent to the spacecraft. The only difference between the modes is the energy channel spacing. There is only1 elevation bin, so effectively a 2D cut through the electron distribution is measured in the ecliptic.
         * The I3 instrument measures positive ions. It can select for m/q and velocity. </Description>
       <Contact>      
-        <PersonID>spase://CNES/Person/Rosenbauer</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Rosenbauer</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>
       <Contact>      
-        <PersonID>spase://CNES/Person/Schwenn</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Schwenn</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>
     </ResourceHeader>
diff --git a/Instrument/CDPP-AMDA/Helios2/E3.xml b/Instrument/CDPP-AMDA/Helios2/E3.xml
index 5ef4a42..c507a6a 100644
--- a/Instrument/CDPP-AMDA/Helios2/E3.xml
+++ b/Instrument/CDPP-AMDA/Helios2/E3.xml
@@ -16,7 +16,7 @@
         At lower bit rates, averages and variances were computed on board for transmission to earth. 
         </Description>
        <Contact>      
-        <PersonID>spase://CNES/Person/Norman.F.Ness</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Norman.F.Ness</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>  
     </ResourceHeader>
diff --git a/Instrument/CDPP-AMDA/Helios2/Ephemeris.xml b/Instrument/CDPP-AMDA/Helios2/Ephemeris.xml
index 2df5094..aef8e69 100644
--- a/Instrument/CDPP-AMDA/Helios2/Ephemeris.xml
+++ b/Instrument/CDPP-AMDA/Helios2/Ephemeris.xml
@@ -9,7 +9,7 @@
       <ReleaseDate>2018-10-20T21:10:13Z</ReleaseDate>
       <Description>Helios2 Ephemeris data are calculated using SPICE kernels taken from the https://naif.jpl.nasa.gov/pub/naif/HELIOS/kernels</Description>
       <Contact>      
-        <PersonID>spase://CNES/Person/Elena.Budnik</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Elena.Budnik</PersonID>
         <Role>TechnicalContact</Role>
       </Contact>
     </ResourceHeader>
diff --git a/Instrument/CDPP-AMDA/Helios2/MAG.xml b/Instrument/CDPP-AMDA/Helios2/MAG.xml
index ea9c662..f1238a3 100644
--- a/Instrument/CDPP-AMDA/Helios2/MAG.xml
+++ b/Instrument/CDPP-AMDA/Helios2/MAG.xml
@@ -31,11 +31,11 @@ E3 :  The Rome‐GSFC magnetic field experiment utilized a triaxial fluxg
 magnetometer.  
         </Description>
        <Contact>      
-        <PersonID>spase://CNES/Person/Musmann</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Musmann</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>
       <Contact>      
-        <PersonID>spase://CNES/Person/Mariani</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Mariani</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>
         <Contact>
@@ -43,7 +43,7 @@ magnetometer. 
         <Role>PrincipalInvestigator</Role>
       </Contact>
       <Contact>      
-        <PersonID>spase://CNES/Person/F.M.Neubauer</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/F.M.Neubauer</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>  
     </ResourceHeader>
diff --git a/Instrument/CDPP-AMDA/ISEE1/Ephemeris.xml b/Instrument/CDPP-AMDA/ISEE1/Ephemeris.xml
index 8bee745..4806879 100644
--- a/Instrument/CDPP-AMDA/ISEE1/Ephemeris.xml
+++ b/Instrument/CDPP-AMDA/ISEE1/Ephemeris.xml
@@ -9,8 +9,7 @@
       <ReleaseDate>2013-04-09T00:00:00Z</ReleaseDate>
       <Description>ISEE1 spacecraft positions in various coordinate systems</Description>
       <Contact>
-        <PersonID>spase://SMWG/Person/Robert.E.McGuire
-</PersonID>
+        <PersonID>spase://SMWG/Person/Robert.E.McGuire</PersonID>
         <Role>MetadataContact</Role>
       </Contact>
         </ResourceHeader>
diff --git a/Instrument/CDPP-AMDA/ISEE1/FVA.xml b/Instrument/CDPP-AMDA/ISEE1/FVA.xml
index 70b59e1..a17f65b 100644
--- a/Instrument/CDPP-AMDA/ISEE1/FVA.xml
+++ b/Instrument/CDPP-AMDA/ISEE1/FVA.xml
@@ -14,7 +14,7 @@
     </Description>
       <Acknowledgement/>
             <Contact>
-                <PersonID>spase://CNES/Person/K.A.Anderson</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/K.A.Anderson</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
       <InformationURL>
diff --git a/Instrument/CDPP-AMDA/ISEE2/Ephemeris.xml b/Instrument/CDPP-AMDA/ISEE2/Ephemeris.xml
index 2d8e998..f547c68 100644
--- a/Instrument/CDPP-AMDA/ISEE2/Ephemeris.xml
+++ b/Instrument/CDPP-AMDA/ISEE2/Ephemeris.xml
@@ -9,8 +9,7 @@
       <ReleaseDate>2013-04-09T00:00:00Z</ReleaseDate>
       <Description>ISEE2 spacecraft positions in various coordinate systems</Description>
       <Contact>
-        <PersonID>spase://SMWG/Person/Robert.E.McGuire
-</PersonID>
+        <PersonID>spase://SMWG/Person/Robert.E.McGuire</PersonID>
         <Role>MetadataContact</Role>
       </Contact>
         </ResourceHeader>
diff --git a/Instrument/CDPP-AMDA/ISEE2/FVA.xml b/Instrument/CDPP-AMDA/ISEE2/FVA.xml
index 6c23837..bac0f34 100644
--- a/Instrument/CDPP-AMDA/ISEE2/FVA.xml
+++ b/Instrument/CDPP-AMDA/ISEE2/FVA.xml
@@ -14,7 +14,7 @@
     </Description>
       <Acknowledgement/>
             <Contact>
-                <PersonID>spase://CNES/Person/K.A.Anderson</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/K.A.Anderson</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
       <InformationURL>
diff --git a/Instrument/CDPP-AMDA/Interball-1/CORALL.xml b/Instrument/CDPP-AMDA/Interball-1/CORALL.xml
index 999a39b..87c7404 100644
--- a/Instrument/CDPP-AMDA/Interball-1/CORALL.xml
+++ b/Instrument/CDPP-AMDA/Interball-1/CORALL.xml
@@ -14,7 +14,7 @@
         is equal to about 4 min.
         </Description>
        <Contact>
-        <PersonID>spase://CNES/Person/Andrey.Fedorov</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Andrey.Fedorov</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>
       <Contact>
diff --git a/Instrument/CDPP-AMDA/Interball-1/DOK2.xml b/Instrument/CDPP-AMDA/Interball-1/DOK2.xml
index 33bcec6..20df139 100644
--- a/Instrument/CDPP-AMDA/Interball-1/DOK2.xml
+++ b/Instrument/CDPP-AMDA/Interball-1/DOK2.xml
@@ -28,11 +28,11 @@
         All other systems both hardware and software are working normally.
       </Description>
        <Contact>
-        <PersonID>spase://CNES/Person/Volt.Lutsenko</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Volt.Lutsenko</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>
       <Contact>
-        <PersonID>spase://CNES/Person/Karel.Kudela</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Karel.Kudela</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>
       <InformationURL>
diff --git a/Instrument/CDPP-AMDA/Interball-1/Models.xml b/Instrument/CDPP-AMDA/Interball-1/Models.xml
index 5af2439..d0f1791 100644
--- a/Instrument/CDPP-AMDA/Interball-1/Models.xml
+++ b/Instrument/CDPP-AMDA/Interball-1/Models.xml
@@ -8,7 +8,7 @@
       <ReleaseDate>2017-02-04T15:37:46Z</ReleaseDate>
       <Description/>
       <Contact>
-        <PersonID>spase://CNES/Person/Christian.Jacquey</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Christian.Jacquey</PersonID>
         <Role>TechnicalContact</Role>
       </Contact>
     </ResourceHeader>
diff --git a/Instrument/CDPP-AMDA/Juice/Ephemeris.xml b/Instrument/CDPP-AMDA/Juice/Ephemeris.xml
index d20695e..881e2b8 100644
--- a/Instrument/CDPP-AMDA/Juice/Ephemeris.xml
+++ b/Instrument/CDPP-AMDA/Juice/Ephemeris.xml
@@ -9,7 +9,7 @@
       <ReleaseDate>2009-05-20T21:10:13Z</ReleaseDate>
       <Description>Juice orbit</Description>
       <Contact>      
-      <PersonID>spase://CNES/Person/ESA.SPICE.Service</PersonID>
+      <PersonID>spase://CNES/Person/CDPP-AMDA/ESA.SPICE.Service</PersonID>
       <Role>PrincipalInvestigator</Role>
       </Contact>
     </ResourceHeader>
diff --git a/Instrument/CDPP-AMDA/Juice/Models.xml b/Instrument/CDPP-AMDA/Juice/Models.xml
index 2941243..8830e57 100644
--- a/Instrument/CDPP-AMDA/Juice/Models.xml
+++ b/Instrument/CDPP-AMDA/Juice/Models.xml
@@ -15,7 +15,7 @@
         (Juno Reference Model through Perijove 9) of the planetary magnetic field with spherical harmonic coefficients well determined through 
         degree and order 10, providing the first detailed view of a planetary dynamo beyond Earth.</Description>
       <Contact>
-        <PersonID>spase://CNES/Person/Connerney</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Connerney</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>   
     </ResourceHeader>
diff --git a/Instrument/CDPP-AMDA/Juno/Ephemeris.xml b/Instrument/CDPP-AMDA/Juno/Ephemeris.xml
index 977a697..16c23b3 100644
--- a/Instrument/CDPP-AMDA/Juno/Ephemeris.xml
+++ b/Instrument/CDPP-AMDA/Juno/Ephemeris.xml
@@ -9,11 +9,11 @@
       <ReleaseDate>2017-01-20T21:10:13Z</ReleaseDate>
       <Description>Juno Orbit</Description>
       <Contact>      
-        <PersonID>spase://CNES/Person/NAIF</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/NAIF</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>
       <Contact>       
-        <PersonID>spase://CNES/Person/Elena.Budnik</PersonID> 
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Elena.Budnik</PersonID> 
         <Role>TechnicalContact</Role>
       </Contact>
     </ResourceHeader>
diff --git a/Instrument/CDPP-AMDA/Juno/FGM.xml b/Instrument/CDPP-AMDA/Juno/FGM.xml
index 1085f2c..9239c98 100644
--- a/Instrument/CDPP-AMDA/Juno/FGM.xml
+++ b/Instrument/CDPP-AMDA/Juno/FGM.xml
@@ -12,7 +12,7 @@
      Limitations: The Juno magnetic field investigation was designed to measure fields to 16 Gauss per axis over 6 dynamic ranges of the instrument, the most sensitive of which is ± 1600 nT with a quantization step size of 0.05 nT (16 bit A/D). Moreover, the spacecraft magnetic requirement was not to exceed 2 nT static and 0.5 nT variable spacecraft-generated magnetic field. In very weak field environments, such as encountered in outer cruise, accuracy may be expected to be limited by sensor offset and spacecraft magnetic field variations. The combined (static) spacecraft-generated magnetic field and sensor offset may be continuously monitored in flight in the spacecraft x and y axis, since the spacecraft spins (nominally at 1 or 2 RPM) about an axis closely aligned with the spacecraft payload z axis. However, offsets in the z axis need be estimated using the Alfvenic properties in the solar wind (ref. Juno Magnetic field investigation paper in Space Science Reviews). Statistical in nature, estimates of z axis zeros are not continuously available and are less accurate than the x and y zeros. Also, variations in spacecraft field over a time span comparable to a spin period will also lead to larger errors. 
       </Description>
       <Contact>
-        <PersonID>spase://CNES/Person/John.E.P.Connerney</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/John.E.P.Connerney</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>
     </ResourceHeader>
diff --git a/Instrument/CDPP-AMDA/Juno/JADE.xml b/Instrument/CDPP-AMDA/Juno/JADE.xml
index 6dbda87..9e31748 100644
--- a/Instrument/CDPP-AMDA/Juno/JADE.xml
+++ b/Instrument/CDPP-AMDA/Juno/JADE.xml
@@ -22,7 +22,7 @@
         50 amu with m/Δ m˜2.5, which is sufficient to separate the heavy and light ions, as well as
         O+ vs S+, in the Jovian magnetosphere.</Description>
       <Contact>      
-        <PersonID>spase://CNES/Person/Allegrini</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Allegrini</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>     
     </ResourceHeader>
diff --git a/Instrument/CDPP-AMDA/Juno/JEDI.xml b/Instrument/CDPP-AMDA/Juno/JEDI.xml
index e53bf80..b32a6fd 100644
--- a/Instrument/CDPP-AMDA/Juno/JEDI.xml
+++ b/Instrument/CDPP-AMDA/Juno/JEDI.xml
@@ -14,7 +14,7 @@ have a time of flight (TOF) and a deposited
       instruments can be operated in a variety of modes, differing in the
       way they use and combine these measurements. </Description>
       <Contact>      
-        <PersonID>spase://CNES/Person/Barry.Mauk</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Barry.Mauk</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>     
     </ResourceHeader>
diff --git a/Instrument/CDPP-AMDA/Juno/Models.xml b/Instrument/CDPP-AMDA/Juno/Models.xml
index d3b5685..6e583d5 100644
--- a/Instrument/CDPP-AMDA/Juno/Models.xml
+++ b/Instrument/CDPP-AMDA/Juno/Models.xml
@@ -15,7 +15,7 @@
         (Juno Reference Model through Perijove 9) of the planetary magnetic field with spherical harmonic coefficients well determined through 
         degree and order 10, providing the first detailed view of a planetary dynamo beyond Earth.</Description>
       <Contact>
-        <PersonID>spase://CNES/Person/Connerney</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Connerney</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>  
     </ResourceHeader>
diff --git a/Instrument/CDPP-AMDA/MAVEN/EUV.xml b/Instrument/CDPP-AMDA/MAVEN/EUV.xml
index c4ab92f..c7319a7 100644
--- a/Instrument/CDPP-AMDA/MAVEN/EUV.xml
+++ b/Instrument/CDPP-AMDA/MAVEN/EUV.xml
@@ -17,7 +17,7 @@
       input to the Flare Irradiance Spectral Model (FISM) model
       </Description>
       <Contact>       
-        <PersonID>spase://CNES/Person/Frank.Eparvier</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Frank.Eparvier</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>
       <InformationURL>
diff --git a/Instrument/CDPP-AMDA/MAVEN/Ephemeris.xml b/Instrument/CDPP-AMDA/MAVEN/Ephemeris.xml
index 21c92ec..0252ea8 100644
--- a/Instrument/CDPP-AMDA/MAVEN/Ephemeris.xml
+++ b/Instrument/CDPP-AMDA/MAVEN/Ephemeris.xml
@@ -9,11 +9,11 @@
       <ReleaseDate>2016-05-20T21:10:13Z</ReleaseDate>
       <Description/>
       <Contact>       
-        <PersonID>spase://CNES/Person/NAIF</PersonID> 
+        <PersonID>spase://CNES/Person/CDPP-AMDA/NAIF</PersonID> 
         <Role>PrincipalInvestigator</Role>
       </Contact>
       <Contact>       
-        <PersonID>spase://CNES/Person/Elena.Budnik</PersonID> 
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Elena.Budnik</PersonID> 
         <Role>TechnicalContact</Role>
       </Contact>
     </ResourceHeader>
diff --git a/Instrument/CDPP-AMDA/MAVEN/MAG.xml b/Instrument/CDPP-AMDA/MAVEN/MAG.xml
index cff562b..e8728ae 100644
--- a/Instrument/CDPP-AMDA/MAVEN/MAG.xml
+++ b/Instrument/CDPP-AMDA/MAVEN/MAG.xml
@@ -13,7 +13,7 @@
         * 32 samples/sec intrinsic sample rate averaged and decimated as necessary
         * Sensor scale factor accuracy of 0.05%</Description>
       <Contact>       
-        <PersonID>spase://CNES/Person/John.E.P.Connerney</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/John.E.P.Connerney</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>
       <InformationURL>
diff --git a/Instrument/CDPP-AMDA/MAVEN/Models.xml b/Instrument/CDPP-AMDA/MAVEN/Models.xml
index 9d5899a..677498b 100644
--- a/Instrument/CDPP-AMDA/MAVEN/Models.xml
+++ b/Instrument/CDPP-AMDA/MAVEN/Models.xml
@@ -9,7 +9,7 @@
       <ReleaseDate>2017-02-04T15:37:46Z</ReleaseDate>
       <Description/>
       <Contact>
-        <PersonID>spase://CNES/Person/Christian.Jacquey</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Christian.Jacquey</PersonID>
         <Role>TechnicalContact</Role>
       </Contact>
     </ResourceHeader>
diff --git a/Instrument/CDPP-AMDA/MAVEN/SWEA.xml b/Instrument/CDPP-AMDA/MAVEN/SWEA.xml
index 36f34eb..06c210c 100644
--- a/Instrument/CDPP-AMDA/MAVEN/SWEA.xml
+++ b/Instrument/CDPP-AMDA/MAVEN/SWEA.xml
@@ -13,7 +13,7 @@
         Measure atmospheric electron impact ionization effects
       </Description>
       <Contact>       
-        <PersonID>spase://CNES/Person/David.L.Mitchell</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/David.L.Mitchell</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>
       <InformationURL>
diff --git a/Instrument/CDPP-AMDA/MAVEN/SWIA.xml b/Instrument/CDPP-AMDA/MAVEN/SWIA.xml
index 04f4a72..8312687 100644
--- a/Instrument/CDPP-AMDA/MAVEN/SWIA.xml
+++ b/Instrument/CDPP-AMDA/MAVEN/SWIA.xml
@@ -16,7 +16,7 @@
         *Measure basic space plasma phenomena, including reconnection, flux ropes, plasmoids, bulk plasma escape, auroral processes, and boundary instabilities, throughout the Martian system
       </Description>
       <Contact>       
-        <PersonID>spase://CNES/Person/Jasper.S.Halekas</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Jasper.S.Halekas</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>
       <InformationURL>
diff --git a/Instrument/CDPP-AMDA/MESSENGER/EPS.xml b/Instrument/CDPP-AMDA/MESSENGER/EPS.xml
index c090326..049d9c6 100644
--- a/Instrument/CDPP-AMDA/MESSENGER/EPS.xml
+++ b/Instrument/CDPP-AMDA/MESSENGER/EPS.xml
@@ -15,7 +15,7 @@ mechanical	collimator	that	delimits	the	look	direction	into	the	instrument.	Part
 pass	through	the	collimator	then	transit	through	a	thin,	composite	Start	foil	(polyimide	+	 
 aluminum,	10	µg/cm2)	and	onto	the	TOF	region	of	the	instrument.</Description>
        <Contact>
-          <PersonID>spase://CNES/Person/George.Ho</PersonID>
+          <PersonID>spase://CNES/Person/CDPP-AMDA/George.Ho</PersonID>
          <Role>Scientist</Role>      
       </Contact> 
       <InformationURL>
diff --git a/Instrument/CDPP-AMDA/MESSENGER/ephemeris.xml b/Instrument/CDPP-AMDA/MESSENGER/ephemeris.xml
index ab33ecb..8bf8c2a 100644
--- a/Instrument/CDPP-AMDA/MESSENGER/ephemeris.xml
+++ b/Instrument/CDPP-AMDA/MESSENGER/ephemeris.xml
@@ -9,7 +9,7 @@
       <ReleaseDate>2017-01-01T21:10:13Z</ReleaseDate>
       <Description/>
      <Contact>
-        <PersonID>spase://CNES/Person/NAIF</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/NAIF</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>
     </ResourceHeader>
diff --git a/Instrument/CDPP-AMDA/MEX/ELS.xml b/Instrument/CDPP-AMDA/MEX/ELS.xml
index 456e128..058e7b6 100644
--- a/Instrument/CDPP-AMDA/MEX/ELS.xml
+++ b/Instrument/CDPP-AMDA/MEX/ELS.xml
@@ -20,7 +20,7 @@ By varying the electrostatic potential between the hemispheres of the electrosta
         <Role>PrincipalInvestigator</Role>
       </Contact>
       <Contact>
-        <PersonID>spase://CNES/Person/Rudy.Frahm</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Rudy.Frahm</PersonID>
         <Role>GeneralContact</Role>
       </Contact>
       <InformationURL>
diff --git a/Instrument/CDPP-AMDA/MEX/Models.xml b/Instrument/CDPP-AMDA/MEX/Models.xml
index 5cdabff..4f34e4e 100644
--- a/Instrument/CDPP-AMDA/MEX/Models.xml
+++ b/Instrument/CDPP-AMDA/MEX/Models.xml
@@ -9,7 +9,7 @@
       <ReleaseDate>2017-02-04T15:37:46Z</ReleaseDate>
       <Description/>
       <Contact>
-        <PersonID>spase://CNES/Person/Christian.Jacquey</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Christian.Jacquey</PersonID>
         <Role>TechnicalContact</Role>
       </Contact>
     </ResourceHeader>
diff --git a/Instrument/CDPP-AMDA/MEX/ephemeris.xml b/Instrument/CDPP-AMDA/MEX/ephemeris.xml
index 2bf30f6..74bfea8 100644
--- a/Instrument/CDPP-AMDA/MEX/ephemeris.xml
+++ b/Instrument/CDPP-AMDA/MEX/ephemeris.xml
@@ -9,7 +9,7 @@
       <ReleaseDate>2017-01-20T21:10:13Z</ReleaseDate>
       <Description/>
      <Contact>       
-        <PersonID>spase://CNES/Person/NAIF</PersonID> 
+        <PersonID>spase://CNES/Person/CDPP-AMDA/NAIF</PersonID> 
         <Role>PrincipalInvestigator</Role>
       </Contact>      
     </ResourceHeader>
diff --git a/Instrument/CDPP-AMDA/MGS/Ephemeris.xml b/Instrument/CDPP-AMDA/MGS/Ephemeris.xml
index 9b9ea2d..51ebea2 100644
--- a/Instrument/CDPP-AMDA/MGS/Ephemeris.xml
+++ b/Instrument/CDPP-AMDA/MGS/Ephemeris.xml
@@ -9,7 +9,7 @@
       <ReleaseDate>2017-01-20T21:10:13Z</ReleaseDate>
       <Description/>
       <Contact>
-        <PersonID>spase://CNES/Person/NAIF</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/NAIF</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>
     </ResourceHeader>
diff --git a/Instrument/CDPP-AMDA/MGS/Models.xml b/Instrument/CDPP-AMDA/MGS/Models.xml
index bf158ec..e8d5b0a 100644
--- a/Instrument/CDPP-AMDA/MGS/Models.xml
+++ b/Instrument/CDPP-AMDA/MGS/Models.xml
@@ -9,7 +9,7 @@
       <ReleaseDate>2017-02-04T15:37:46Z</ReleaseDate>
       <Description/>
       <Contact>
-        <PersonID>spase://CNES/Person/Christian.Jacquey</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Christian.Jacquey</PersonID>
         <Role>TechnicalContact</Role>
       </Contact>
     </ResourceHeader>
diff --git a/Instrument/CDPP-AMDA/MGS/PROXY.xml b/Instrument/CDPP-AMDA/MGS/PROXY.xml
index a7f3a54..1b01a5f 100644
--- a/Instrument/CDPP-AMDA/MGS/PROXY.xml
+++ b/Instrument/CDPP-AMDA/MGS/PROXY.xml
@@ -9,7 +9,7 @@
       <ReleaseDate>2009-05-20T21:10:13Z</ReleaseDate>
       <Description>Several useful MGS proxies</Description>
       <Contact>      
-        <PersonID>spase://CNES/Person/David.Brain</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/David.Brain</PersonID>
         <Role>TechnicalContact</Role>
       </Contact>
       <InformationURL>
diff --git a/Instrument/CDPP-AMDA/MMS1/EDP.xml b/Instrument/CDPP-AMDA/MMS1/EDP.xml
index 0aa8dd2..fdba19d 100644
--- a/Instrument/CDPP-AMDA/MMS1/EDP.xml
+++ b/Instrument/CDPP-AMDA/MMS1/EDP.xml
@@ -16,15 +16,15 @@ giving a 120 m baseline for each of the two spin-plane electric field components
 biased cylindrical probes extended on ~12 m long stiff booms along the spacecraft axis, giving a 29.2 
 m baseline for the axial electric field component.</Description>
       <Contact>
-        <PersonID>spase://CNES/Person/James.L.Burch</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/James.L.Burch</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>  
       <Contact>
-        <PersonID>spase://CNES/Person/Robert.E.Ergun</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Robert.E.Ergun</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>
       <Contact>
-        <PersonID>spase://CNES/Person/P.Lindqvist</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/P.Lindqvist</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>    
     </ResourceHeader>
diff --git a/Instrument/CDPP-AMDA/MMS1/Ephemeris.xml b/Instrument/CDPP-AMDA/MMS1/Ephemeris.xml
index 83ae180..e9c0006 100644
--- a/Instrument/CDPP-AMDA/MMS1/Ephemeris.xml
+++ b/Instrument/CDPP-AMDA/MMS1/Ephemeris.xml
@@ -9,11 +9,11 @@
       <ReleaseDate>2017-02-04T15:37:46Z</ReleaseDate>
       <Description></Description>
       <Contact>
-        <PersonID>spase://CNES/Person/M.G.Henderson</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/M.G.Henderson</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>
       <Contact>
-        <PersonID>spase://CNES/Person/S.K.Morley</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/S.K.Morley</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>    
     </ResourceHeader>
diff --git a/Instrument/CDPP-AMDA/MMS1/FGM.xml b/Instrument/CDPP-AMDA/MMS1/FGM.xml
index e13a8ef..86bbc33 100644
--- a/Instrument/CDPP-AMDA/MMS1/FGM.xml
+++ b/Instrument/CDPP-AMDA/MMS1/FGM.xml
@@ -18,7 +18,7 @@ rotation axis allows accurate monitoring of the zero levels along the rotation a
 survey (8 samples per second) outside of the Region of Interest (ROI), and fast survey (16 samples per second) inside the ROI. 
 Within the ROI burst mode data (128 samples per second) are also acquired.</Description>
       <Contact>
-        <PersonID>spase://CNES/Person/James.L.Burch</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/James.L.Burch</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>  
       <Contact>
@@ -26,7 +26,7 @@ Within the ROI burst mode data (128 samples per second) are also acquired.</Desc
         <Role>PrincipalInvestigator</Role>
       </Contact>
       <Contact>
-        <PersonID>spase://CNES/Person/W.Magnus</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/W.Magnus</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>    
     </ResourceHeader>
diff --git a/Instrument/CDPP-AMDA/MMS1/FPI.xml b/Instrument/CDPP-AMDA/MMS1/FPI.xml
index 951b104..041871c 100644
--- a/Instrument/CDPP-AMDA/MMS1/FPI.xml
+++ b/Instrument/CDPP-AMDA/MMS1/FPI.xml
@@ -9,11 +9,11 @@
       <ReleaseDate>2017-02-04T15:37:46Z</ReleaseDate>
       <Description>The Fast Plasma Investigation (FPI) includes four dual electron spectrometers (DES) and four dual ion spectrometers (DIS) per spacecraft. When the data from the two sets of four dual-spectrometers are combined, FPI is able to provide the velocity-space distribution of electrons from 10 eV to 30 keV and ions from 10 eV to 30 keV with a time resolution of 30 ms, and 150 ms, respectively.</Description>
       <Contact>
-        <PersonID>spase://CNES/Person/James.L.Burch</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/James.L.Burch</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>
       <Contact>
-        <PersonID>spase://CNES/Person/B.Giles</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/B.Giles</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>    
     </ResourceHeader>
diff --git a/Instrument/CDPP-AMDA/MMS1/HPCA.xml b/Instrument/CDPP-AMDA/MMS1/HPCA.xml
index 1bd4f8e..ea01900 100644
--- a/Instrument/CDPP-AMDA/MMS1/HPCA.xml
+++ b/Instrument/CDPP-AMDA/MMS1/HPCA.xml
@@ -9,11 +9,11 @@
       <ReleaseDate>2017-02-04T15:37:46Z</ReleaseDate>
       <Description> </Description>
       <Contact>
-        <PersonID>spase://CNES/Person/James.L.Burch</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/James.L.Burch</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>  
       <Contact>
-        <PersonID>spase://CNES/Person/S.Fuselier</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/S.Fuselier</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>    
     </ResourceHeader>
diff --git a/Instrument/CDPP-AMDA/MMS1/Models.xml b/Instrument/CDPP-AMDA/MMS1/Models.xml
index 3c1deb7..2a3513c 100644
--- a/Instrument/CDPP-AMDA/MMS1/Models.xml
+++ b/Instrument/CDPP-AMDA/MMS1/Models.xml
@@ -8,7 +8,7 @@
       <ReleaseDate>2017-02-04T15:37:46Z</ReleaseDate>
       <Description/>
       <Contact>
-        <PersonID>spase://CNES/Person/Christian.Jacquey</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Christian.Jacquey</PersonID>
         <Role>TechnicalContact</Role>
       </Contact>
     </ResourceHeader>
diff --git a/Instrument/CDPP-AMDA/MMS1234/Ephemeris.xml b/Instrument/CDPP-AMDA/MMS1234/Ephemeris.xml
index e0a9be0..83531d3 100644
--- a/Instrument/CDPP-AMDA/MMS1234/Ephemeris.xml
+++ b/Instrument/CDPP-AMDA/MMS1234/Ephemeris.xml
@@ -9,11 +9,11 @@
       <ReleaseDate>2017-02-04T15:37:46Z</ReleaseDate>
       <Description></Description>
       <Contact>
-        <PersonID>spase://CNES/Person/M.G.Henderson</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/M.G.Henderson</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>
       <Contact>
-        <PersonID>spase://CNES/Person/S.K.Morley</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/S.K.Morley</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>    
     </ResourceHeader>
diff --git a/Instrument/CDPP-AMDA/MMS1234/FGM.xml b/Instrument/CDPP-AMDA/MMS1234/FGM.xml
index a1a87a8..18b88b8 100644
--- a/Instrument/CDPP-AMDA/MMS1234/FGM.xml
+++ b/Instrument/CDPP-AMDA/MMS1234/FGM.xml
@@ -18,7 +18,7 @@ rotation axis allows accurate monitoring of the zero levels along the rotation a
 survey (8 samples per second) outside of the Region of Interest (ROI), and fast survey (16 samples per second) inside the ROI. 
 Within the ROI burst mode data (128 samples per second) are also acquired.</Description>
    <Contact>
-    <PersonID>spase://CNES/Person/James.L.Burch</PersonID>
+    <PersonID>spase://CNES/Person/CDPP-AMDA/James.L.Burch</PersonID>
     <Role>ProjectScientist</Role>
    </Contact>
    <Contact>
@@ -26,7 +26,7 @@ Within the ROI burst mode data (128 samples per second) are also acquired.</Desc
     <Role>PrincipalInvestigator</Role>
    </Contact>
    <Contact>
-    <PersonID>spase://CNES/Person/W.Magnus</PersonID>
+    <PersonID>spase://CNES/Person/CDPP-AMDA/W.Magnus</PersonID>
     <Role>PrincipalInvestigator</Role>
    </Contact>
   </ResourceHeader>
diff --git a/Instrument/CDPP-AMDA/MMS2/EDP.xml b/Instrument/CDPP-AMDA/MMS2/EDP.xml
index d8f6303..172f36e 100644
--- a/Instrument/CDPP-AMDA/MMS2/EDP.xml
+++ b/Instrument/CDPP-AMDA/MMS2/EDP.xml
@@ -16,15 +16,15 @@ giving a 120 m baseline for each of the two spin-plane electric field components
 biased cylindrical probes extended on ~12 m long stiff booms along the spacecraft axis, giving a 29.2 
 m baseline for the axial electric field component.</Description>
       <Contact>
-        <PersonID>spase://CNES/Person/James.L.Burch</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/James.L.Burch</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>  
       <Contact>
-        <PersonID>spase://CNES/Person/Robert.E.Ergun</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Robert.E.Ergun</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>
       <Contact>
-        <PersonID>spase://CNES/Person/P.Lindqvist</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/P.Lindqvist</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>    
     </ResourceHeader>
diff --git a/Instrument/CDPP-AMDA/MMS2/Ephemeris.xml b/Instrument/CDPP-AMDA/MMS2/Ephemeris.xml
index dd907a8..b09068e 100644
--- a/Instrument/CDPP-AMDA/MMS2/Ephemeris.xml
+++ b/Instrument/CDPP-AMDA/MMS2/Ephemeris.xml
@@ -9,11 +9,11 @@
       <ReleaseDate>2017-02-04T15:37:46Z</ReleaseDate>
       <Description></Description>
       <Contact>
-        <PersonID>spase://CNES/Person/M.G.Henderson</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/M.G.Henderson</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>
       <Contact>
-        <PersonID>spase://CNES/Person/S.K.Morley</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/S.K.Morley</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>    
     </ResourceHeader>
diff --git a/Instrument/CDPP-AMDA/MMS2/FGM.xml b/Instrument/CDPP-AMDA/MMS2/FGM.xml
index 09114c6..7887cec 100644
--- a/Instrument/CDPP-AMDA/MMS2/FGM.xml
+++ b/Instrument/CDPP-AMDA/MMS2/FGM.xml
@@ -18,7 +18,7 @@ rotation axis allows accurate monitoring of the zero levels along the rotation a
 survey (8 samples per second) outside of the Region of Interest (ROI), and fast survey (16 samples per second) inside the ROI. 
 Within the ROI burst mode data (128 samples per second) are also acquired.</Description>
       <Contact>
-        <PersonID>spase://CNES/Person/James.L.Burch</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/James.L.Burch</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>  
       <Contact>
@@ -26,7 +26,7 @@ Within the ROI burst mode data (128 samples per second) are also acquired.</Desc
         <Role>PrincipalInvestigator</Role>
       </Contact>
       <Contact>
-        <PersonID>spase://CNES/Person/W.Magnus</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/W.Magnus</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>    
     </ResourceHeader>
diff --git a/Instrument/CDPP-AMDA/MMS2/FPI.xml b/Instrument/CDPP-AMDA/MMS2/FPI.xml
index 0b0f1a7..0098c5d 100644
--- a/Instrument/CDPP-AMDA/MMS2/FPI.xml
+++ b/Instrument/CDPP-AMDA/MMS2/FPI.xml
@@ -9,11 +9,11 @@
       <ReleaseDate>2017-02-04T15:37:46Z</ReleaseDate>
       <Description>The Fast Plasma Investigation (FPI) includes four dual electron spectrometers (DES) and four dual ion spectrometers (DIS) per spacecraft. When the data from the two sets of four dual-spectrometers are combined, FPI is able to provide the velocity-space distribution of electrons from 10 eV to 30 keV and ions from 10 eV to 30 keV with a time resolution of 30 ms, and 150 ms, respectively.</Description>
       <Contact>
-        <PersonID>spase://CNES/Person/James.L.Burch</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/James.L.Burch</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>
       <Contact>
-        <PersonID>spase://CNES/Person/B.Giles</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/B.Giles</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>    
     </ResourceHeader>
diff --git a/Instrument/CDPP-AMDA/MMS2/HPCA.xml b/Instrument/CDPP-AMDA/MMS2/HPCA.xml
index 0c9eb34..cd28e64 100644
--- a/Instrument/CDPP-AMDA/MMS2/HPCA.xml
+++ b/Instrument/CDPP-AMDA/MMS2/HPCA.xml
@@ -9,11 +9,11 @@
       <ReleaseDate>2017-02-04T15:37:46Z</ReleaseDate>
       <Description>The Hot Plasma Composition Analyzer (HPCA) measures the composition-resolved velocity-space distribution of ions from 1 eV to 40 keV with time resolution of 10 - 15 seconds (Young et al., 2014).</Description>
       <Contact>
-        <PersonID>spase://CNES/Person/James.L.Burch</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/James.L.Burch</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>  
       <Contact>
-        <PersonID>spase://CNES/Person/S.Fuselier</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/S.Fuselier</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>    
     </ResourceHeader>
diff --git a/Instrument/CDPP-AMDA/MMS2/Models.xml b/Instrument/CDPP-AMDA/MMS2/Models.xml
index 6592f01..d4c635a 100644
--- a/Instrument/CDPP-AMDA/MMS2/Models.xml
+++ b/Instrument/CDPP-AMDA/MMS2/Models.xml
@@ -8,7 +8,7 @@
       <ReleaseDate>2017-02-04T15:37:46Z</ReleaseDate>
       <Description/>
       <Contact>
-        <PersonID>spase://CNES/Person/Christian.Jacquey</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Christian.Jacquey</PersonID>
         <Role>TechnicalContact</Role>
       </Contact>
     </ResourceHeader>
diff --git a/Instrument/CDPP-AMDA/MMS3/EDP.xml b/Instrument/CDPP-AMDA/MMS3/EDP.xml
index 7243b6b..09e558a 100644
--- a/Instrument/CDPP-AMDA/MMS3/EDP.xml
+++ b/Instrument/CDPP-AMDA/MMS3/EDP.xml
@@ -16,15 +16,15 @@ giving a 120 m baseline for each of the two spin-plane electric field components
 biased cylindrical probes extended on ~12 m long stiff booms along the spacecraft axis, giving a 29.2 
 m baseline for the axial electric field component.</Description>
       <Contact>
-        <PersonID>spase://CNES/Person/James.L.Burch</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/James.L.Burch</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>  
       <Contact>
-        <PersonID>spase://CNES/Person/Robert.E.Ergun</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Robert.E.Ergun</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>
       <Contact>
-        <PersonID>spase://CNES/Person/P.Lindqvist</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/P.Lindqvist</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>    
     </ResourceHeader>
diff --git a/Instrument/CDPP-AMDA/MMS3/Ephemeris.xml b/Instrument/CDPP-AMDA/MMS3/Ephemeris.xml
index b33eb07..d0d61d5 100644
--- a/Instrument/CDPP-AMDA/MMS3/Ephemeris.xml
+++ b/Instrument/CDPP-AMDA/MMS3/Ephemeris.xml
@@ -9,11 +9,11 @@
       <ReleaseDate>2017-02-04T15:37:46Z</ReleaseDate>
       <Description></Description>
       <Contact>
-        <PersonID>spase://CNES/Person/M.G.Henderson</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/M.G.Henderson</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>
       <Contact>
-        <PersonID>spase://CNES/Person/S.K.Morley</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/S.K.Morley</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>    
     </ResourceHeader>
diff --git a/Instrument/CDPP-AMDA/MMS3/FGM.xml b/Instrument/CDPP-AMDA/MMS3/FGM.xml
index 37bc4ab..b226739 100644
--- a/Instrument/CDPP-AMDA/MMS3/FGM.xml
+++ b/Instrument/CDPP-AMDA/MMS3/FGM.xml
@@ -18,7 +18,7 @@ rotation axis allows accurate monitoring of the zero levels along the rotation a
 survey (8 samples per second) outside of the Region of Interest (ROI), and fast survey (16 samples per second) inside the ROI. 
 Within the ROI burst mode data (128 samples per second) are also acquired.</Description>
       <Contact>
-        <PersonID>spase://CNES/Person/James.L.Burch</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/James.L.Burch</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>  
       <Contact>
@@ -26,7 +26,7 @@ Within the ROI burst mode data (128 samples per second) are also acquired.</Desc
         <Role>PrincipalInvestigator</Role>
       </Contact>
       <Contact>
-        <PersonID>spase://CNES/Person/W.Magnus</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/W.Magnus</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>    
     </ResourceHeader>
diff --git a/Instrument/CDPP-AMDA/MMS3/FPI.xml b/Instrument/CDPP-AMDA/MMS3/FPI.xml
index a747028..eebc2f2 100644
--- a/Instrument/CDPP-AMDA/MMS3/FPI.xml
+++ b/Instrument/CDPP-AMDA/MMS3/FPI.xml
@@ -9,11 +9,11 @@
       <ReleaseDate>2017-02-04T15:37:46Z</ReleaseDate>
       <Description>The Fast Plasma Investigation (FPI) includes four dual electron spectrometers (DES) and four dual ion spectrometers (DIS) per spacecraft. When the data from the two sets of four dual-spectrometers are combined, FPI is able to provide the velocity-space distribution of electrons from 10 eV to 30 keV and ions from 10 eV to 30 keV with a time resolution of 30 ms, and 150 ms, respectively.</Description>
       <Contact>
-        <PersonID>spase://CNES/Person/James.L.Burch</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/James.L.Burch</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>
       <Contact>
-        <PersonID>spase://CNES/Person/B.Giles</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/B.Giles</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>    
     </ResourceHeader>
diff --git a/Instrument/CDPP-AMDA/MMS3/HPCA.xml b/Instrument/CDPP-AMDA/MMS3/HPCA.xml
index 24fe51b..ce79100 100644
--- a/Instrument/CDPP-AMDA/MMS3/HPCA.xml
+++ b/Instrument/CDPP-AMDA/MMS3/HPCA.xml
@@ -9,11 +9,11 @@
       <ReleaseDate>2017-02-04T15:37:46Z</ReleaseDate>
       <Description>The Hot Plasma Composition Analyzer (HPCA) measures the composition-resolved velocity-space distribution of ions from 1 eV to 40 keV with time resolution of 10 - 15 seconds (Young et al., 2014).</Description>
       <Contact>
-        <PersonID>spase://CNES/Person/James.L.Burch</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/James.L.Burch</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>  
       <Contact>
-        <PersonID>spase://CNES/Person/S.Fuselier</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/S.Fuselier</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>    
     </ResourceHeader>
diff --git a/Instrument/CDPP-AMDA/MMS3/Models.xml b/Instrument/CDPP-AMDA/MMS3/Models.xml
index d82a2af..580fd23 100644
--- a/Instrument/CDPP-AMDA/MMS3/Models.xml
+++ b/Instrument/CDPP-AMDA/MMS3/Models.xml
@@ -8,7 +8,7 @@
       <ReleaseDate>2017-02-04T15:37:46Z</ReleaseDate>
       <Description/>
       <Contact>
-        <PersonID>spase://CNES/Person/Christian.Jacquey</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Christian.Jacquey</PersonID>
         <Role>TechnicalContact</Role>
       </Contact>
     </ResourceHeader>
diff --git a/Instrument/CDPP-AMDA/MMS4/EDP.xml b/Instrument/CDPP-AMDA/MMS4/EDP.xml
index 0121765..ebb7db9 100644
--- a/Instrument/CDPP-AMDA/MMS4/EDP.xml
+++ b/Instrument/CDPP-AMDA/MMS4/EDP.xml
@@ -16,15 +16,15 @@ giving a 120 m baseline for each of the two spin-plane electric field components
 biased cylindrical probes extended on ~12 m long stiff booms along the spacecraft axis, giving a 29.2 
 m baseline for the axial electric field component.</Description>
       <Contact>
-        <PersonID>spase://CNES/Person/James.L.Burch</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/James.L.Burch</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>  
       <Contact>
-        <PersonID>spase://CNES/Person/Robert.E.Ergun</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Robert.E.Ergun</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>
       <Contact>
-        <PersonID>spase://CNES/Person/P.Lindqvist</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/P.Lindqvist</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>    
     </ResourceHeader>
diff --git a/Instrument/CDPP-AMDA/MMS4/Ephemeris.xml b/Instrument/CDPP-AMDA/MMS4/Ephemeris.xml
index f4a7cb2..e25452c 100644
--- a/Instrument/CDPP-AMDA/MMS4/Ephemeris.xml
+++ b/Instrument/CDPP-AMDA/MMS4/Ephemeris.xml
@@ -9,11 +9,11 @@
       <ReleaseDate>2017-02-04T15:37:46Z</ReleaseDate>
       <Description></Description>
       <Contact>
-        <PersonID>spase://CNES/Person/M.G.Henderson</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/M.G.Henderson</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>
       <Contact>
-        <PersonID>spase://CNES/Person/S.K.Morley</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/S.K.Morley</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>    
     </ResourceHeader>
diff --git a/Instrument/CDPP-AMDA/MMS4/FGM.xml b/Instrument/CDPP-AMDA/MMS4/FGM.xml
index 5584170..ada8ae9 100644
--- a/Instrument/CDPP-AMDA/MMS4/FGM.xml
+++ b/Instrument/CDPP-AMDA/MMS4/FGM.xml
@@ -18,7 +18,7 @@ rotation axis allows accurate monitoring of the zero levels along the rotation a
 survey (8 samples per second) outside of the Region of Interest (ROI), and fast survey (16 samples per second) inside the ROI. 
 Within the ROI burst mode data (128 samples per second) are also acquired.</Description>
       <Contact>
-        <PersonID>spase://CNES/Person/James.L.Burch</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/James.L.Burch</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>  
       <Contact>
@@ -26,7 +26,7 @@ Within the ROI burst mode data (128 samples per second) are also acquired.</Desc
         <Role>PrincipalInvestigator</Role>
       </Contact>
       <Contact>
-        <PersonID>spase://CNES/Person/W.Magnus</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/W.Magnus</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>    
     </ResourceHeader>
diff --git a/Instrument/CDPP-AMDA/MMS4/FPI.xml b/Instrument/CDPP-AMDA/MMS4/FPI.xml
index 9c1702c..5bec989 100644
--- a/Instrument/CDPP-AMDA/MMS4/FPI.xml
+++ b/Instrument/CDPP-AMDA/MMS4/FPI.xml
@@ -9,11 +9,11 @@
       <ReleaseDate>2017-02-04T15:37:46Z</ReleaseDate>
       <Description>The Fast Plasma Investigation (FPI) includes four dual electron spectrometers (DES) and four dual ion spectrometers (DIS) per spacecraft. When the data from the two sets of four dual-spectrometers are combined, FPI is able to provide the velocity-space distribution of electrons from 10 eV to 30 keV and ions from 10 eV to 30 keV with a time resolution of 30 ms, and 150 ms, respectively.</Description>
       <Contact>
-        <PersonID>spase://CNES/Person/James.L.Burch</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/James.L.Burch</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>
       <Contact>
-        <PersonID>spase://CNES/Person/B.Giles</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/B.Giles</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>    
     </ResourceHeader>
diff --git a/Instrument/CDPP-AMDA/MMS4/HPCA.xml b/Instrument/CDPP-AMDA/MMS4/HPCA.xml
index 33fb4ad..f0c82ef 100644
--- a/Instrument/CDPP-AMDA/MMS4/HPCA.xml
+++ b/Instrument/CDPP-AMDA/MMS4/HPCA.xml
@@ -9,11 +9,11 @@
       <ReleaseDate>2017-02-04T15:37:46Z</ReleaseDate>
       <Description>The Hot Plasma Composition Analyzer (HPCA) measures the composition-resolved velocity-space distribution of ions from 1 eV to 40 keV with time resolution of 10 - 15 seconds (Young et al., 2014).</Description>
       <Contact>
-        <PersonID>spase://CNES/Person/James.L.Burch</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/James.L.Burch</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>  
       <Contact>
-        <PersonID>spase://CNES/Person/S.Fuselier</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/S.Fuselier</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>    
     </ResourceHeader>
diff --git a/Instrument/CDPP-AMDA/MMS4/Models.xml b/Instrument/CDPP-AMDA/MMS4/Models.xml
index ad9b433..21996cf 100644
--- a/Instrument/CDPP-AMDA/MMS4/Models.xml
+++ b/Instrument/CDPP-AMDA/MMS4/Models.xml
@@ -8,7 +8,7 @@
       <ReleaseDate>2017-02-04T15:37:46Z</ReleaseDate>
       <Description/>
       <Contact>
-        <PersonID>spase://CNES/Person/Christian.Jacquey</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Christian.Jacquey</PersonID>
         <Role>TechnicalContact</Role>
       </Contact>
     </ResourceHeader>
diff --git a/Instrument/CDPP-AMDA/Mariner10/Ephemeris.xml b/Instrument/CDPP-AMDA/Mariner10/Ephemeris.xml
index 296396e..f82216e 100644
--- a/Instrument/CDPP-AMDA/Mariner10/Ephemeris.xml
+++ b/Instrument/CDPP-AMDA/Mariner10/Ephemeris.xml
@@ -8,7 +8,7 @@
       <ReleaseDate>2020-11-16T09:30:00Z</ReleaseDate>
       <Description>Mariner 10 orbit data</Description>
       <Contact>
-                <PersonID>spase://CNES/Person/Norman.F.Ness</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Norman.F.Ness</PersonID>
                 <Role>PrincipalInvestigator</Role>
       </Contact>
     </ResourceHeader>
diff --git a/Instrument/CDPP-AMDA/Mariner10/Magnetometer.xml b/Instrument/CDPP-AMDA/Mariner10/Magnetometer.xml
index 92b5e5b..b872404 100644
--- a/Instrument/CDPP-AMDA/Mariner10/Magnetometer.xml
+++ b/Instrument/CDPP-AMDA/Mariner10/Magnetometer.xml
@@ -18,7 +18,7 @@
                 five vectors per second were transmitted. The experiment functioned normally throughout the life of the spacecraft.
 </Description>
             <Contact>
-                <PersonID>spase://CNES/Person/Norman.F.Ness</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Norman.F.Ness</PersonID>
                 <Role>PrincipalInvestigator</Role>
 </Contact>
             <InformationURL>
diff --git a/Instrument/CDPP-AMDA/Mariner10/PLS.xml b/Instrument/CDPP-AMDA/Mariner10/PLS.xml
index 90d524b..c78034a 100644
--- a/Instrument/CDPP-AMDA/Mariner10/PLS.xml
+++ b/Instrument/CDPP-AMDA/Mariner10/PLS.xml
@@ -12,11 +12,11 @@
 			    This plasma experiment was designed to: (1) determine the mode of interaction between the planet Mercury and the solar wind; (2) make a comprehensive study of the plasma regime at Mercury; (3) verify and extend previous observations of the solar wind interaction with Venus; (4) clarify the role of electrons in the interactions; and, (5) study the solar wind between 0.4--1.0 AU. Instrumentation for the experiment consisted of two sunward-facing electrostatic analyzers (SESA) and one backward facing electron spectrometer (BESA). These three detectors were mounted on a scanning platform, which could be swept at 1 degree/s through an arc of 120 degrees centered on a direction in the ecliptic plane 6 degrees east of the spacecraft-sun line. Both SESAs failed to return data. They were to measure positive ions from 0.08--8 keV and electrons from 4--400 eV. The BESA had a fan-shaped field of view of +/-3.5 x +/-13.5 degrees. The larger angle was normal to, and symmetric about, the scan arc. An electron spectrum was obtained every 6 s, and consisted of flux measurements in fifteen logarithmically spaced energy channels (with channel width delta-E/E=6.6%) within the energy range 13.4--690 eV. Because solar wind flow past a spacecraft introduces angular distortion of the electron distribution function compared to what would be observed in the solar wind rest frame, it was possible, by taking into account this distortion and the spacecraft sheath characteristics, to derive some of the solar wind plasma parameters such as ion bulk speed, electron temperature, and electron density. The reliability of these parameters is necessarily dependent on the validity of the spacecraft sheath model employed in the analysis, and is thus affected by time changes in the ambient solar wind.
 	    </Description>
             <Contact>
-                <PersonID>spase://CNES/Person/Herbert.S.Bridge</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Herbert.S.Bridge</PersonID>
                 <Role>PrincipalInvestigator</Role>
 	</Contact>
 	<Contact>
-		<PersonID>spase://CNES/Person/Clayne.M.Yeates</PersonID>
+		<PersonID>spase://CNES/Person/CDPP-AMDA/Clayne.M.Yeates</PersonID>
 			<Role>PrincipalInverstigator</Role>
 		</Contact>
             <InformationURL>
diff --git a/Instrument/CDPP-AMDA/POLAR/HYDRA.xml b/Instrument/CDPP-AMDA/POLAR/HYDRA.xml
index 3001c8d..bbedbac 100644
--- a/Instrument/CDPP-AMDA/POLAR/HYDRA.xml
+++ b/Instrument/CDPP-AMDA/POLAR/HYDRA.xml
@@ -12,7 +12,7 @@
                 * (2) to understand the role of field-aligned currents in the auroral zone, their relation to auroral forms and terrestrial kilometric radiation, and their response to magnetotail and solar wind stimuli as monitored by the other ISTP program spacecraft; to ascertain the altitude dependence of the associated electrical potential and the parameters which control its size; 
                 * (3) to obtain a quantitative, high time resolution definition of the regions associated with the cusp and entry layer including a study of the momentum transfer between magnetosheath and entry layer plasmas. The instrument, named HYDRA, resolves electrons and ions, in three dimensions, with energies between 1 eV and 30 keV with 0.5-s time resolution. HYDRA consists of eight pairs of 127-deg electrostatic analyzer heads. Six pairs are body mounted, and two are on the loss cone platform.</Description>
             <Contact>
-                <PersonID>spase://CNES/Person/Jack.D.Scudder</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Jack.D.Scudder</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <InformationURL>
diff --git a/Instrument/CDPP-AMDA/POLAR/Models.xml b/Instrument/CDPP-AMDA/POLAR/Models.xml
index 121843f..2a8bf25 100644
--- a/Instrument/CDPP-AMDA/POLAR/Models.xml
+++ b/Instrument/CDPP-AMDA/POLAR/Models.xml
@@ -8,7 +8,7 @@
       <ReleaseDate>2017-02-04T15:37:46Z</ReleaseDate>
       <Description/>
       <Contact>
-        <PersonID>spase://CNES/Person/Christian.Jacquey</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Christian.Jacquey</PersonID>
         <Role>TechnicalContact</Role>
       </Contact>
     </ResourceHeader>
diff --git a/Instrument/CDPP-AMDA/PSP/MAG.xml b/Instrument/CDPP-AMDA/PSP/MAG.xml
index 18dbcb0..538e2d1 100644
--- a/Instrument/CDPP-AMDA/PSP/MAG.xml
+++ b/Instrument/CDPP-AMDA/PSP/MAG.xml
@@ -15,7 +15,7 @@
       <Acknowledgement>National Aeronautics and Space Administration, NASA, and the French Centre National d'Etudes Spatiales, CNES</Acknowledgement>
       <Contact>
         <!-- ude.yelekreb.lss@elab -->
-        <PersonID>spase://SMWG/Person/Stuart.D.Bale </PersonID>
+        <PersonID>spase://SMWG/Person/Stuart.D.Bale</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>
       <Contact>
diff --git a/Instrument/CDPP-AMDA/Phobos2/Ephemeris.xml b/Instrument/CDPP-AMDA/Phobos2/Ephemeris.xml
index d8e2d5a..f6fb574 100644
--- a/Instrument/CDPP-AMDA/Phobos2/Ephemeris.xml
+++ b/Instrument/CDPP-AMDA/Phobos2/Ephemeris.xml
@@ -10,7 +10,7 @@
       <Description/>      
       <Acknowledgement/>
       <Contact>
-        <PersonID>spase://CNES/Person/NAIF</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/NAIF</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>
     </ResourceHeader>
diff --git a/Instrument/CDPP-AMDA/Rosetta/AUX.xml b/Instrument/CDPP-AMDA/Rosetta/AUX.xml
index bb0f428..7320051 100644
--- a/Instrument/CDPP-AMDA/Rosetta/AUX.xml
+++ b/Instrument/CDPP-AMDA/Rosetta/AUX.xml
@@ -9,7 +9,7 @@
       <ReleaseDate>2017-03-20T21:10:13Z</ReleaseDate>
       <Description>Usefull orbit/attitude Rosetta data produced by WIGNER Research Centre for Physics,Hungary</Description>
       <Contact>       
-        <PersonID>spase://CNES/Person/L.Foldy</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/L.Foldy</PersonID>
         <Role>TechnicalContact</Role>
       </Contact>
     </ResourceHeader>
diff --git a/Instrument/CDPP-AMDA/Rosetta/Ephemeris.xml b/Instrument/CDPP-AMDA/Rosetta/Ephemeris.xml
index 09c8a24..64c184b 100644
--- a/Instrument/CDPP-AMDA/Rosetta/Ephemeris.xml
+++ b/Instrument/CDPP-AMDA/Rosetta/Ephemeris.xml
@@ -9,7 +9,7 @@
       <ReleaseDate>2017-05-20T21:10:13Z</ReleaseDate>
       <Description>Rosetta Ephemeris data are calculated using SPICE kernels taken from the ftp://ssols01.esac.esa.int/pub/data/SPICE/ROSETTA/kernels/ (PSA)</Description>
       <Contact>      
-        <PersonID>spase://CNES/Person/Elena.Budnik</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Elena.Budnik</PersonID>
         <Role>TechnicalContact</Role>
       </Contact>
     </ResourceHeader>
diff --git a/Instrument/CDPP-AMDA/Rosetta/IES.xml b/Instrument/CDPP-AMDA/Rosetta/IES.xml
index acef3bc..2b17fd2 100644
--- a/Instrument/CDPP-AMDA/Rosetta/IES.xml
+++ b/Instrument/CDPP-AMDA/Rosetta/IES.xml
@@ -9,11 +9,11 @@
       <ReleaseDate>2017-02-20T21:10:13Z</ReleaseDate>
       <Description>The IES is a plasma instrument consisting of two electrostatic analyzers, one each for electrons and ions. In general, IES acquires ion and electron measurements in 256 bins over an azimuth range of 90 degrees and polar angle of 360 degrees (less spacecraft obstructions). Thus IES collects plasma data roughly in 2.8 π steradians of space, and samples plasma velocity space.</Description>
       <Contact>       
-        <PersonID>spase://CNES/Person/James.L.Burch</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/James.L.Burch</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>
       <Contact>       
-        <PersonID>spase://CNES/Person/Ray.Goldstein</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Ray.Goldstein</PersonID>
         <Role>CoInvestigator</Role>
       </Contact>
     </ResourceHeader>
diff --git a/Instrument/CDPP-AMDA/Rosetta/LAP.xml b/Instrument/CDPP-AMDA/Rosetta/LAP.xml
index 8f3353b..0ae0220 100644
--- a/Instrument/CDPP-AMDA/Rosetta/LAP.xml
+++ b/Instrument/CDPP-AMDA/Rosetta/LAP.xml
@@ -29,7 +29,7 @@ products also with use of data from RPC-MIP. Do not expect all parameters to be 
 any given time.
       </Description>
       <Contact>       
-         <PersonID>spase://CNES/Person/Anders.Eriksson</PersonID>
+         <PersonID>spase://CNES/Person/CDPP-AMDA/Anders.Eriksson</PersonID>
         <Role>PrincipalInvestigator</Role> 
       </Contact>
     </ResourceHeader>
diff --git a/Instrument/CDPP-AMDA/Rosetta/MIP.xml b/Instrument/CDPP-AMDA/Rosetta/MIP.xml
index 18725f8..b28e5b0 100644
--- a/Instrument/CDPP-AMDA/Rosetta/MIP.xml
+++ b/Instrument/CDPP-AMDA/Rosetta/MIP.xml
@@ -32,7 +32,7 @@
       bandwidth.        
       </Description>
       <Contact>       
-        <PersonID>spase://CNES/Person/Pierre.Henri</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Pierre.Henri</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>
     </ResourceHeader>
diff --git a/Instrument/CDPP-AMDA/Rosetta/RSN.xml b/Instrument/CDPP-AMDA/Rosetta/RSN.xml
index afb1956..b3ec742 100644
--- a/Instrument/CDPP-AMDA/Rosetta/RSN.xml
+++ b/Instrument/CDPP-AMDA/Rosetta/RSN.xml
@@ -18,7 +18,7 @@
         measuring both total and ram pressure, and will be used to determine the gas density and 
         rate of radial gas flow.</Description>
       <Contact>       
-        <PersonID>spase://CNES/Person/Martin.Rubin</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Martin.Rubin</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>
     </ResourceHeader>
diff --git a/Instrument/CDPP-AMDA/STEREO-A/Ephemeris.xml b/Instrument/CDPP-AMDA/STEREO-A/Ephemeris.xml
index 599c074..f361d20 100644
--- a/Instrument/CDPP-AMDA/STEREO-A/Ephemeris.xml
+++ b/Instrument/CDPP-AMDA/STEREO-A/Ephemeris.xml
@@ -9,7 +9,7 @@
       <ReleaseDate>2018-10-20T21:10:10Z</ReleaseDate>
       <Description>STEREO-A spacecraft position in various coordinate systems are calculated using SPICE kernels taken from the https://sohowww.nascom.nasa.gov/</Description>
        <Contact>      
-        <PersonID>spase://CNES/Person/Elena.Budnik</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Elena.Budnik</PersonID>
         <Role>TechnicalContact</Role>
       </Contact>
     </ResourceHeader>
diff --git a/Instrument/CDPP-AMDA/STEREO-B/Ephemeris.xml b/Instrument/CDPP-AMDA/STEREO-B/Ephemeris.xml
index 5485f41..ee79133 100644
--- a/Instrument/CDPP-AMDA/STEREO-B/Ephemeris.xml
+++ b/Instrument/CDPP-AMDA/STEREO-B/Ephemeris.xml
@@ -9,7 +9,7 @@
       <ReleaseDate>2018-10-20T21:10:12Z</ReleaseDate>
       <Description>STEREO-B spacecraft position in various coordinate systems are calculated using SPICE kernels taken from the https://sohowww.nascom.nasa.gov/</Description>
       <Contact>      
-        <PersonID>spase://CNES/Person/Elena.Budnik</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Elena.Budnik</PersonID>
         <Role>TechnicalContact</Role>
       </Contact>
     </ResourceHeader>
diff --git a/Instrument/CDPP-AMDA/SWARM-A/Ephemeris.xml b/Instrument/CDPP-AMDA/SWARM-A/Ephemeris.xml
index dbbc6ee..62018b2 100644
--- a/Instrument/CDPP-AMDA/SWARM-A/Ephemeris.xml
+++ b/Instrument/CDPP-AMDA/SWARM-A/Ephemeris.xml
@@ -10,7 +10,7 @@
       <Description>SWARM-A orbital information is obtained from MAG, EFI / LP and EFI / TII datasets</Description>      
       <Acknowledgement/>
       <Contact>
-        <PersonID>spase://CNES/Person/R.Haagmans</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/R.Haagmans</PersonID>
         <Role>ProjectScientist</Role>
       </Contact>
     </ResourceHeader>
diff --git a/Instrument/CDPP-AMDA/SWARM-A/GNSS.xml b/Instrument/CDPP-AMDA/SWARM-A/GNSS.xml
index 61b478b..21d7735 100644
--- a/Instrument/CDPP-AMDA/SWARM-A/GNSS.xml
+++ b/Instrument/CDPP-AMDA/SWARM-A/GNSS.xml
@@ -9,7 +9,7 @@
       <ReleaseDate>2016-11-04T15:37:46Z</ReleaseDate>
       <Description></Description>  
        <Contact>
-         <PersonID>spase://CNES/Person/R.Haagmans</PersonID>
+         <PersonID>spase://CNES/Person/CDPP-AMDA/R.Haagmans</PersonID>
         <Role>ProjectScientist</Role> 
       </Contact> 
       <InformationURL>
diff --git a/Instrument/CDPP-AMDA/SWARM-A/LP.xml b/Instrument/CDPP-AMDA/SWARM-A/LP.xml
index 7b69b0d..7f0659b 100644
--- a/Instrument/CDPP-AMDA/SWARM-A/LP.xml
+++ b/Instrument/CDPP-AMDA/SWARM-A/LP.xml
@@ -11,11 +11,11 @@
 mode featuring a sinusoidally varying bias suitable for measuring not only currents, but also admittances. A 
 comparable instrument has not previously been in orbit.</Description>
       <Contact>
-        <PersonID>spase://CNES/Person/D.Knudsen</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/D.Knudsen</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>
       <Contact>
-        <PersonID>spase://CNES/Person/S.Buchert</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/S.Buchert</PersonID>
         <Role>Scientist</Role>
       </Contact>
       <InformationURL>
diff --git a/Instrument/CDPP-AMDA/SWARM-A/MAG.xml b/Instrument/CDPP-AMDA/SWARM-A/MAG.xml
index 4d6882e..b9e22e0 100644
--- a/Instrument/CDPP-AMDA/SWARM-A/MAG.xml
+++ b/Instrument/CDPP-AMDA/SWARM-A/MAG.xml
@@ -10,7 +10,7 @@
       <Description>* The Absolute Scalar Magnetometer (ASM) measures the magnetic field intensity at the tip of the boom. The ASM is an absolute instrument, i.e. it is not subject to changes of its intrinsic parameters over time. It uses the PPS as the absolute, external reference. 
       * The Vector Field Magnetometer (VFM) measures the magnetic field vector at the tip of the optical bench on  the boom. The sensor is a 3-axis Compact Spherical Coil (CSC) with a 3-axis Compact Detector Coil (CDC) inside.  The instrument operates as a closed-loop system adjusting the compensating CSC currents to maintain a null field at the detector coils within the sphere. The VFM is an analogue instrument and as such subject to temporal changes due to radiation and aging effects of the electronics. The effects are only significant in the bias and linear scale parameters of the characterization; hence these parameters are estimated daily through a comparison of the VFM output with the ASM scalar magnetometer output.</Description>                       
       <Contact>
-        <PersonID>spase://CNES/Person/G.Hulot</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/G.Hulot</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>
       <InformationURL>
diff --git a/Instrument/CDPP-AMDA/SWARM-A/TII.xml b/Instrument/CDPP-AMDA/SWARM-A/TII.xml
index 6cada6a..a9012b2 100644
--- a/Instrument/CDPP-AMDA/SWARM-A/TII.xml
+++ b/Instrument/CDPP-AMDA/SWARM-A/TII.xml
@@ -9,11 +9,11 @@
       <ReleaseDate>2016-11-04T15:37:46Z</ReleaseDate>
       <Description>The Electric Field Instrument determines the ion density, the ion drift velocity, and the electric field at the S/C front panel (in-flight). The instrument consists of two components: the Langmuir Probe (LP) and the Thermal Ion Imager (TII).</Description>    
        <Contact>
-        <PersonID>spase://CNES/Person/D.Knudsen</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/D.Knudsen</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>
       <Contact>
-        <PersonID>spase://CNES/Person/Johnathan.Burchill</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Johnathan.Burchill</PersonID>
         <Role>Scientist</Role>
       </Contact>
       <InformationURL>
diff --git a/Instrument/CDPP-AMDA/SWARM-B/Ephemeris.xml b/Instrument/CDPP-AMDA/SWARM-B/Ephemeris.xml
index ecd1cc2..4cba7d5 100644
--- a/Instrument/CDPP-AMDA/SWARM-B/Ephemeris.xml
+++ b/Instrument/CDPP-AMDA/SWARM-B/Ephemeris.xml
@@ -10,7 +10,7 @@
       <Description>SWARM-B orbital information is obtained from MAG, EFI / LP and EFI / TII datasets</Description>      
       <Acknowledgement/>
       <Contact>
-        <PersonID>spase://CNES/Person/R.Haagmans</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/R.Haagmans</PersonID>
         <Role>ProjectScientist</Role>
       </Contact>
     </ResourceHeader>
diff --git a/Instrument/CDPP-AMDA/SWARM-B/GNSS.xml b/Instrument/CDPP-AMDA/SWARM-B/GNSS.xml
index ba9480a..8f0959c 100644
--- a/Instrument/CDPP-AMDA/SWARM-B/GNSS.xml
+++ b/Instrument/CDPP-AMDA/SWARM-B/GNSS.xml
@@ -9,7 +9,7 @@
       <ReleaseDate>2016-11-04T15:37:46Z</ReleaseDate>
       <Description></Description>  
        <Contact>
-         <PersonID>spase://CNES/Person/R.Haagmans</PersonID>
+         <PersonID>spase://CNES/Person/CDPP-AMDA/R.Haagmans</PersonID>
         <Role>ProjectScientist</Role> 
       </Contact> 
       <InformationURL>
diff --git a/Instrument/CDPP-AMDA/SWARM-B/LP.xml b/Instrument/CDPP-AMDA/SWARM-B/LP.xml
index 867a3ff..f6c2e2a 100644
--- a/Instrument/CDPP-AMDA/SWARM-B/LP.xml
+++ b/Instrument/CDPP-AMDA/SWARM-B/LP.xml
@@ -11,11 +11,11 @@
 mode featuring a sinusoidally varying bias suitable for measuring not only currents, but also admittances. A 
 comparable instrument has not previously been in orbit.</Description>  
        <Contact>
-        <PersonID>spase://CNES/Person/D.Knudsen</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/D.Knudsen</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>
       <Contact>
-        <PersonID>spase://CNES/Person/S.Buchert</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/S.Buchert</PersonID>
         <Role>Scientist</Role>
       </Contact>
       <InformationURL>
diff --git a/Instrument/CDPP-AMDA/SWARM-B/MAG.xml b/Instrument/CDPP-AMDA/SWARM-B/MAG.xml
index 8a62ba8..ae3a0d4 100644
--- a/Instrument/CDPP-AMDA/SWARM-B/MAG.xml
+++ b/Instrument/CDPP-AMDA/SWARM-B/MAG.xml
@@ -10,7 +10,7 @@
         <Description>* The Absolute Scalar Magnetometer (ASM) measures the magnetic field intensity at the tip of the boom. The ASM is an absolute instrument, i.e. it is not subject to changes of its intrinsic parameters over time. It uses the PPS as the absolute, external reference. 
       * The Vector Field Magnetometer (VFM) measures the magnetic field vector at the tip of the optical bench on the boom. The sensor is a 3-axis Compact Spherical Coil (CSC) with a 3-axis Compact Detector Coil (CDC) inside.  The instrument operates as a closed-loop system adjusting the compensating CSC currents to maintain a null field at the detector coils within the sphere. The VFM is an analogue instrument and as such subject to temporal changes due to radiation and aging effects of the electronics. The effects are only significant in the bias and linear scale parameters of the characterization; hence these parameters are estimated daily through a comparison of the VFM output with the ASM scalar magnetometer output.</Description>           
       <Contact>
-         <PersonID>spase://CNES/Person/G.Hulot</PersonID>
+         <PersonID>spase://CNES/Person/CDPP-AMDA/G.Hulot</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>
       <InformationURL>
diff --git a/Instrument/CDPP-AMDA/SWARM-B/TII.xml b/Instrument/CDPP-AMDA/SWARM-B/TII.xml
index c2a5b39..800a41b 100644
--- a/Instrument/CDPP-AMDA/SWARM-B/TII.xml
+++ b/Instrument/CDPP-AMDA/SWARM-B/TII.xml
@@ -9,11 +9,11 @@
       <ReleaseDate>2016-11-04T15:37:46Z</ReleaseDate>
       <Description>The Electric Field Instrument determines the ion density, the ion drift velocity, and the electric field at the S/C front panel (in-flight). The instrument consists of two components: the Langmuir Probe (LP) and the Thermal Ion Imager (TII).</Description>    
        <Contact>
-        <PersonID>spase://CNES/Person/D.Knudsen</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/D.Knudsen</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>
       <Contact>
-        <PersonID>spase://CNES/Person/Johnathan.Burchill</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Johnathan.Burchill</PersonID>
         <Role>Scientist</Role>
       </Contact>
       <InformationURL>
diff --git a/Instrument/CDPP-AMDA/SWARM-C/Ephemeris.xml b/Instrument/CDPP-AMDA/SWARM-C/Ephemeris.xml
index 7327b1b..a501065 100644
--- a/Instrument/CDPP-AMDA/SWARM-C/Ephemeris.xml
+++ b/Instrument/CDPP-AMDA/SWARM-C/Ephemeris.xml
@@ -10,7 +10,7 @@
       <Description>SWARM-C orbital information is obtained from MAG, EFI / LP and EFI / TII datasets</Description>      
       <Acknowledgement/>
       <Contact>
-        <PersonID>spase://CNES/Person/R.Haagmans</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/R.Haagmans</PersonID>
         <Role>ProjectScientist</Role>
       </Contact>
     </ResourceHeader>
diff --git a/Instrument/CDPP-AMDA/SWARM-C/GNSS.xml b/Instrument/CDPP-AMDA/SWARM-C/GNSS.xml
index 32b7471..401a9d4 100644
--- a/Instrument/CDPP-AMDA/SWARM-C/GNSS.xml
+++ b/Instrument/CDPP-AMDA/SWARM-C/GNSS.xml
@@ -9,7 +9,7 @@
       <ReleaseDate>2016-11-04T15:37:46Z</ReleaseDate>
       <Description></Description>  
        <Contact>
-         <PersonID>spase://CNES/Person/R.Haagmans</PersonID>
+         <PersonID>spase://CNES/Person/CDPP-AMDA/R.Haagmans</PersonID>
         <Role>ProjectScientist</Role> 
       </Contact> 
       <InformationURL>
diff --git a/Instrument/CDPP-AMDA/SWARM-C/LP.xml b/Instrument/CDPP-AMDA/SWARM-C/LP.xml
index d908713..266910d 100644
--- a/Instrument/CDPP-AMDA/SWARM-C/LP.xml
+++ b/Instrument/CDPP-AMDA/SWARM-C/LP.xml
@@ -12,11 +12,11 @@ mode featuring a sinusoidally varying bias suitable for measuring not only curre
 comparable instrument has not previously been in orbit.
 </Description>
        <Contact>
-        <PersonID>spase://CNES/Person/D.Knudsen</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/D.Knudsen</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>
       <Contact>
-        <PersonID>spase://CNES/Person/S.Buchert</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/S.Buchert</PersonID>
         <Role>Scientist</Role>
       </Contact>
       <InformationURL>
diff --git a/Instrument/CDPP-AMDA/SWARM-C/MAG.xml b/Instrument/CDPP-AMDA/SWARM-C/MAG.xml
index 296a27a..ce74973 100644
--- a/Instrument/CDPP-AMDA/SWARM-C/MAG.xml
+++ b/Instrument/CDPP-AMDA/SWARM-C/MAG.xml
@@ -10,7 +10,7 @@
       <Description>* The Absolute Scalar Magnetometer (ASM) measures the magnetic field intensity at the tip of the boom. The ASM is an absolute instrument, i.e. it is not subject to changes of its intrinsic parameters over time. It uses the PPS as the absolute, external reference. 
       * The Vector Field Magnetometer (VFM) measures the magnetic field vector at the tip of the optical bench on the boom. The sensor is a 3-axis Compact Spherical Coil (CSC) with a 3-axis Compact Detector Coil (CDC) inside. The instrument operates as a closed-loop system adjusting the compensating CSC currents to maintain a null field at the detector coils within the sphere. The VFM is an analogue instrument and as such subject to temporal changes due to radiation and aging effects of the electronics. The effects are only significant in the bias and linear scale parameters of the characterization; hence these parameters are estimated daily through a comparison of the VFM output with the ASM scalar magnetometer output.</Description>    
       <Contact>
-        <PersonID>spase://CNES/Person/G.Hulot</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/G.Hulot</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>
       <InformationURL>
diff --git a/Instrument/CDPP-AMDA/SWARM-C/TII.xml b/Instrument/CDPP-AMDA/SWARM-C/TII.xml
index 9eccb61..d621388 100644
--- a/Instrument/CDPP-AMDA/SWARM-C/TII.xml
+++ b/Instrument/CDPP-AMDA/SWARM-C/TII.xml
@@ -9,11 +9,11 @@
       <ReleaseDate>2016-11-04T15:37:46Z</ReleaseDate>
       <Description>The Electric Field Instrument determines the ion density, the ion drift velocity, and the electric field at the S/C front panel (in-flight). The instrument consists of two components: the Langmuir Probe (LP) and the Thermal Ion Imager (TII).</Description>    
        <Contact>
-        <PersonID>spase://CNES/Person/D.Knudsen</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/D.Knudsen</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>
       <Contact>
-        <PersonID>spase://CNES/Person/Johnathan.Burchill</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Johnathan.Burchill</PersonID>
         <Role>Scientist</Role>
       </Contact>
       <InformationURL>
diff --git a/Instrument/CDPP-AMDA/Solar_Orbiter/EPD-EPT.xml b/Instrument/CDPP-AMDA/Solar_Orbiter/EPD-EPT.xml
index 97ef11e..2dea57e 100644
--- a/Instrument/CDPP-AMDA/Solar_Orbiter/EPD-EPT.xml
+++ b/Instrument/CDPP-AMDA/Solar_Orbiter/EPD-EPT.xml
@@ -23,7 +23,7 @@
       spectrum unchanged in the measured range.</Description>        
       <Acknowledgement></Acknowledgement>
       <Contact>
-        <PersonID>spase://CNES/Person/J.Rodrigues-Pacheco</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/J.Rodrigues-Pacheco</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>   
       <InformationURL>
diff --git a/Instrument/CDPP-AMDA/Solar_Orbiter/EPD-HET.xml b/Instrument/CDPP-AMDA/Solar_Orbiter/EPD-HET.xml
index a2422c7..80cb683 100644
--- a/Instrument/CDPP-AMDA/Solar_Orbiter/EPD-HET.xml
+++ b/Instrument/CDPP-AMDA/Solar_Orbiter/EPD-HET.xml
@@ -22,7 +22,7 @@
         identify particle species in a wide energy range.</Description>        
       <Acknowledgement></Acknowledgement>
       <Contact>
-        <PersonID>spase://CNES/Person/J.Rodrigues-Pacheco</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/J.Rodrigues-Pacheco</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>   
       <InformationURL>
diff --git a/Instrument/CDPP-AMDA/Solar_Orbiter/EPD-SIS.xml b/Instrument/CDPP-AMDA/Solar_Orbiter/EPD-SIS.xml
index 41f855d..bee354e 100644
--- a/Instrument/CDPP-AMDA/Solar_Orbiter/EPD-SIS.xml
+++ b/Instrument/CDPP-AMDA/Solar_Orbiter/EPD-SIS.xml
@@ -22,7 +22,7 @@
      </Description>        
       <Acknowledgement></Acknowledgement>
       <Contact>
-        <PersonID>spase://CNES/Person/J.Rodrigues-Pacheco</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/J.Rodrigues-Pacheco</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>   
       <InformationURL>
diff --git a/Instrument/CDPP-AMDA/Solar_Orbiter/EPD-STEP.xml b/Instrument/CDPP-AMDA/Solar_Orbiter/EPD-STEP.xml
index b85d33b..2b43112 100644
--- a/Instrument/CDPP-AMDA/Solar_Orbiter/EPD-STEP.xml
+++ b/Instrument/CDPP-AMDA/Solar_Orbiter/EPD-STEP.xml
@@ -24,7 +24,7 @@
       </Description>
       <Acknowledgement></Acknowledgement>
       <Contact>
-        <PersonID>spase://CNES/Person/J.Rodrigues-Pacheco</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/J.Rodrigues-Pacheco</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>   
       <InformationURL>
diff --git a/Instrument/CDPP-AMDA/Solar_Orbiter/Ephemeris.xml b/Instrument/CDPP-AMDA/Solar_Orbiter/Ephemeris.xml
index 8b3f1ef..81d6715 100644
--- a/Instrument/CDPP-AMDA/Solar_Orbiter/Ephemeris.xml
+++ b/Instrument/CDPP-AMDA/Solar_Orbiter/Ephemeris.xml
@@ -9,7 +9,7 @@
       <ReleaseDate>2018-10-28T21:10:13Z</ReleaseDate>
       <Description>Calculated at IRAP from SPICE kernels</Description>
       <Contact>
-        <PersonID>spase://CNES/Person/Elena.Budnik</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Elena.Budnik</PersonID>
         <Role>DataProducer</Role>
       </Contact>
     </ResourceHeader>
diff --git a/Instrument/CDPP-AMDA/Solar_Orbiter/MAG.xml b/Instrument/CDPP-AMDA/Solar_Orbiter/MAG.xml
index d6ec5d3..49b18ee 100644
--- a/Instrument/CDPP-AMDA/Solar_Orbiter/MAG.xml
+++ b/Instrument/CDPP-AMDA/Solar_Orbiter/MAG.xml
@@ -42,7 +42,7 @@ and are intended for rapid, broad characterisation of solar wind conditions at t
 location.</Description>
       <Acknowledgement></Acknowledgement>
       <Contact>
-        <PersonID>spase://CNES/Person/Tim.Horbury</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Tim.Horbury</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>   
       <InformationURL>
diff --git a/Instrument/CDPP-AMDA/Solar_Orbiter/PAS.xml b/Instrument/CDPP-AMDA/Solar_Orbiter/PAS.xml
index 9d1fcfb..e2d5325 100644
--- a/Instrument/CDPP-AMDA/Solar_Orbiter/PAS.xml
+++ b/Instrument/CDPP-AMDA/Solar_Orbiter/PAS.xml
@@ -37,7 +37,7 @@ snapshots is generally of 4 distributions / s (4 Hz analysis).</Description>
         <Role>PrincipalInvestigator</Role>
       </Contact> 
       <Contact>
-        <PersonID>spase://CNES/Person/Andrei.Fedorov</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Andrei.Fedorov</PersonID>
         <Role>TechnicalContact</Role>
       </Contact>       
       <InformationURL>
diff --git a/Instrument/CDPP-AMDA/THEMIS/A/Models.xml b/Instrument/CDPP-AMDA/THEMIS/A/Models.xml
index e9997da..635e049 100644
--- a/Instrument/CDPP-AMDA/THEMIS/A/Models.xml
+++ b/Instrument/CDPP-AMDA/THEMIS/A/Models.xml
@@ -8,7 +8,7 @@
       <ReleaseDate>2017-02-04T15:37:46Z</ReleaseDate>
       <Description/>
       <Contact>
-        <PersonID>spase://CNES/Person/Christian.Jacquey</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Christian.Jacquey</PersonID>
         <Role>TechnicalContact</Role>
       </Contact>
     </ResourceHeader>
diff --git a/Instrument/CDPP-AMDA/THEMIS/B/Models.xml b/Instrument/CDPP-AMDA/THEMIS/B/Models.xml
index 2625b52..92ff615 100644
--- a/Instrument/CDPP-AMDA/THEMIS/B/Models.xml
+++ b/Instrument/CDPP-AMDA/THEMIS/B/Models.xml
@@ -8,7 +8,7 @@
       <ReleaseDate>2017-02-04T15:37:46Z</ReleaseDate>
       <Description/>
       <Contact>
-        <PersonID>spase://CNES/Person/Christian.Jacquey</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Christian.Jacquey</PersonID>
         <Role>TechnicalContact</Role>
       </Contact>
     </ResourceHeader>
diff --git a/Instrument/CDPP-AMDA/THEMIS/C/Models.xml b/Instrument/CDPP-AMDA/THEMIS/C/Models.xml
index aa59416..fbd8c4e 100644
--- a/Instrument/CDPP-AMDA/THEMIS/C/Models.xml
+++ b/Instrument/CDPP-AMDA/THEMIS/C/Models.xml
@@ -8,7 +8,7 @@
       <ReleaseDate>2017-02-04T15:37:46Z</ReleaseDate>
       <Description/>
       <Contact>
-        <PersonID>spase://CNES/Person/Christian.Jacquey</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Christian.Jacquey</PersonID>
         <Role>TechnicalContact</Role>
       </Contact>
     </ResourceHeader>
diff --git a/Instrument/CDPP-AMDA/THEMIS/D/Models.xml b/Instrument/CDPP-AMDA/THEMIS/D/Models.xml
index 28c63c0..d991568 100644
--- a/Instrument/CDPP-AMDA/THEMIS/D/Models.xml
+++ b/Instrument/CDPP-AMDA/THEMIS/D/Models.xml
@@ -8,7 +8,7 @@
       <ReleaseDate>2017-02-04T15:37:46Z</ReleaseDate>
       <Description/>
       <Contact>
-        <PersonID>spase://CNES/Person/Christian.Jacquey</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Christian.Jacquey</PersonID>
         <Role>TechnicalContact</Role>
       </Contact>
     </ResourceHeader>
diff --git a/Instrument/CDPP-AMDA/THEMIS/E/Models.xml b/Instrument/CDPP-AMDA/THEMIS/E/Models.xml
index 777cbf2..01111d1 100644
--- a/Instrument/CDPP-AMDA/THEMIS/E/Models.xml
+++ b/Instrument/CDPP-AMDA/THEMIS/E/Models.xml
@@ -8,7 +8,7 @@
       <ReleaseDate>2017-02-04T15:37:46Z</ReleaseDate>
       <Description/>
       <Contact>
-        <PersonID>spase://CNES/Person/Christian.Jacquey</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Christian.Jacquey</PersonID>
         <Role>TechnicalContact</Role>
       </Contact>
     </ResourceHeader>
diff --git a/Instrument/CDPP-AMDA/TIMED/SEE.xml b/Instrument/CDPP-AMDA/TIMED/SEE.xml
index e295b08..3c71a5b 100644
--- a/Instrument/CDPP-AMDA/TIMED/SEE.xml
+++ b/Instrument/CDPP-AMDA/TIMED/SEE.xml
@@ -42,7 +42,7 @@ May 3, 2010, Mar. 23, 2011, June 23, 2012, Oct 21, 2013, and
 June 1, 2016.
 </Description>
       <Contact>       
-        <PersonID>spase://CNES/Person/T.Woods</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/T.Woods</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>
       <InformationURL>
diff --git a/Instrument/CDPP-AMDA/VEX/ELS.xml b/Instrument/CDPP-AMDA/VEX/ELS.xml
index 0d4105b..6f2e388 100644
--- a/Instrument/CDPP-AMDA/VEX/ELS.xml
+++ b/Instrument/CDPP-AMDA/VEX/ELS.xml
@@ -15,7 +15,7 @@ divided into 16 sectors. The sensor is a standard top-hat electrostatic analyzer
         <Role>PrincipalInvestigator</Role>
       </Contact>
       <Contact>
-        <PersonID>spase://CNES/Person/Andrew.J.Coates</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Andrew.J.Coates</PersonID>
         <Role>GeneralContact</Role>
       </Contact>
       <InformationURL>
diff --git a/Instrument/CDPP-AMDA/VEX/MAG.xml b/Instrument/CDPP-AMDA/VEX/MAG.xml
index 7c265f0..19ea671 100644
--- a/Instrument/CDPP-AMDA/VEX/MAG.xml
+++ b/Instrument/CDPP-AMDA/VEX/MAG.xml
@@ -15,7 +15,7 @@
         <Role>PrincipalInvestigator</Role>
       </Contact>
       <Contact>       
-        <PersonID>spase://CNES/Person/Magda.Delva</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Magda.Delva</PersonID>
         <Role>GeneralContact</Role>
       </Contact>
       <InformationURL>
diff --git a/Instrument/CDPP-AMDA/VEX/ephemeris.xml b/Instrument/CDPP-AMDA/VEX/ephemeris.xml
index ec5f328..84907fb 100644
--- a/Instrument/CDPP-AMDA/VEX/ephemeris.xml
+++ b/Instrument/CDPP-AMDA/VEX/ephemeris.xml
@@ -9,7 +9,7 @@
       <ReleaseDate>2009-05-20T21:10:13Z</ReleaseDate>
       <Description/>
       <Contact>       
-        <PersonID>spase://CNES/Person/NAIF</PersonID> 
+        <PersonID>spase://CNES/Person/CDPP-AMDA/NAIF</PersonID> 
         <Role>PrincipalInvestigator</Role>
       </Contact>
     </ResourceHeader>
diff --git a/Instrument/CDPP-AMDA/Voyager1/Ephemeris.xml b/Instrument/CDPP-AMDA/Voyager1/Ephemeris.xml
index acb89b5..0a16be2 100644
--- a/Instrument/CDPP-AMDA/Voyager1/Ephemeris.xml
+++ b/Instrument/CDPP-AMDA/Voyager1/Ephemeris.xml
@@ -9,7 +9,7 @@
       <ReleaseDate>2009-05-20T21:10:13Z</ReleaseDate>
       <Description>Voyager 1 spacecraft positions</Description>
       <Contact>
-             <PersonID>spase://CNES/Person/Elena.Budnik</PersonID>
+             <PersonID>spase://CNES/Person/CDPP-AMDA/Elena.Budnik</PersonID>
               <Role>TechnicalContact</Role>
        </Contact>
     </ResourceHeader>
diff --git a/Instrument/CDPP-AMDA/Voyager2/Ephemeris.xml b/Instrument/CDPP-AMDA/Voyager2/Ephemeris.xml
index 374516d..2c64e16 100644
--- a/Instrument/CDPP-AMDA/Voyager2/Ephemeris.xml
+++ b/Instrument/CDPP-AMDA/Voyager2/Ephemeris.xml
@@ -9,7 +9,7 @@
       <ReleaseDate>2009-05-20T21:10:14Z</ReleaseDate>
       <Description>Voyager 2 spacecraft positions</Description>
       <Contact>
-             <PersonID>spase://CNES/Person/Elena.Budnik</PersonID>
+             <PersonID>spase://CNES/Person/CDPP-AMDA/Elena.Budnik</PersonID>
               <Role>TechnicalContact</Role>
        </Contact> 
     </ResourceHeader>
diff --git a/NumericalData/CDPP-AMDA/ACE/SWEPAM/ace-swe-all.xml b/NumericalData/CDPP-AMDA/ACE/SWEPAM/ace-swe-all.xml
index 6718c0d..8d1f182 100644
--- a/NumericalData/CDPP-AMDA/ACE/SWEPAM/ace-swe-all.xml
+++ b/NumericalData/CDPP-AMDA/ACE/SWEPAM/ace-swe-all.xml
@@ -19,7 +19,7 @@
       </Acknowledgement>
       <Contact>
         <!-- David McComas -->
-        <PersonID>spase://CNES/Person/David.J.McComas</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/David.J.McComas</PersonID>
         <Role>CoInvestigator</Role>
       </Contact>
       <Contact>
diff --git a/NumericalData/CDPP-AMDA/ACE/SWEPAM/ace-swepam-real.xml b/NumericalData/CDPP-AMDA/ACE/SWEPAM/ace-swepam-real.xml
index 1ab9ca6..ebcf37c 100644
--- a/NumericalData/CDPP-AMDA/ACE/SWEPAM/ace-swepam-real.xml
+++ b/NumericalData/CDPP-AMDA/ACE/SWEPAM/ace-swepam-real.xml
@@ -16,7 +16,7 @@
       </Acknowledgement>
       <Contact>
         <!-- David McComas -->
-        <PersonID>spase://CNES/Person/David.J.McComas</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/David.J.McComas</PersonID>
         <Role>CoInvestigator</Role>
       </Contact>
       <Contact>
diff --git a/NumericalData/CDPP-AMDA/ACE/SWEPAM/ace-swepam-stea.xml b/NumericalData/CDPP-AMDA/ACE/SWEPAM/ace-swepam-stea.xml
index 5de8d91..3802896 100644
--- a/NumericalData/CDPP-AMDA/ACE/SWEPAM/ace-swepam-stea.xml
+++ b/NumericalData/CDPP-AMDA/ACE/SWEPAM/ace-swepam-stea.xml
@@ -20,7 +20,7 @@ Also note that the detector gains on the SWEPAM-E instrument change over time, i
       </Acknowledgement>
       <Contact>
         <!-- David McComas -->
-        <PersonID>spase://CNES/Person/David.J.McComas</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/David.J.McComas</PersonID>
         <Role>CoInvestigator</Role>
       </Contact>
       <Contact>
diff --git a/NumericalData/CDPP-AMDA/ACE/SWEPAM/ace-swp-all.xml b/NumericalData/CDPP-AMDA/ACE/SWEPAM/ace-swp-all.xml
index 2c01400..d1c39b8 100644
--- a/NumericalData/CDPP-AMDA/ACE/SWEPAM/ace-swp-all.xml
+++ b/NumericalData/CDPP-AMDA/ACE/SWEPAM/ace-swp-all.xml
@@ -19,7 +19,7 @@
       </Acknowledgement>
         <Contact>
         <!-- David McComas -->
-        <PersonID>spase://CNES/Person/David.J.McComas</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/David.J.McComas</PersonID>
         <Role>CoInvestigator</Role>
       </Contact> 
        <Contact>
diff --git a/NumericalData/CDPP-AMDA/Bepi/Ephemeris/bepi-cruise-all.xml b/NumericalData/CDPP-AMDA/Bepi/Ephemeris/bepi-cruise-all.xml
index c2dd60d..1b3e698 100644
--- a/NumericalData/CDPP-AMDA/Bepi/Ephemeris/bepi-cruise-all.xml
+++ b/NumericalData/CDPP-AMDA/Bepi/Ephemeris/bepi-cruise-all.xml
@@ -10,7 +10,7 @@
             <ReleaseDate>2016-02-04T11:46:04Z</ReleaseDate>
             <Description>Calculated in IRAP by using Bepi SPICE kernels</Description>
              <Contact>       
-                 <PersonID>spase://CNES/Person/Marc.Sitja</PersonID> 
+                 <PersonID>spase://CNES/Person/CDPP-AMDA/Marc.Sitja</PersonID> 
                  <Role>PrincipalInvestigator</Role>
              </Contact> 
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Bepi/Ephemeris/bepi-orb-earth.xml b/NumericalData/CDPP-AMDA/Bepi/Ephemeris/bepi-orb-earth.xml
index f9c2061..49442c6 100644
--- a/NumericalData/CDPP-AMDA/Bepi/Ephemeris/bepi-orb-earth.xml
+++ b/NumericalData/CDPP-AMDA/Bepi/Ephemeris/bepi-orb-earth.xml
@@ -9,7 +9,7 @@
             <ReleaseDate>2016-02-04T11:46:04Z</ReleaseDate>
             <Description>Calculated in IRAP by using Bepi SPICE kernels</Description>
              <Contact>       
-                 <PersonID>spase://CNES/Person/Marc.Sitja</PersonID> 
+                 <PersonID>spase://CNES/Person/CDPP-AMDA/Marc.Sitja</PersonID> 
                  <Role>PrincipalInvestigator</Role>
              </Contact>             
         </ResourceHeader>
diff --git a/NumericalData/CDPP-AMDA/Bepi/Ephemeris/bepi-orb-venus1.xml b/NumericalData/CDPP-AMDA/Bepi/Ephemeris/bepi-orb-venus1.xml
index 6c73cbb..4e5705b 100644
--- a/NumericalData/CDPP-AMDA/Bepi/Ephemeris/bepi-orb-venus1.xml
+++ b/NumericalData/CDPP-AMDA/Bepi/Ephemeris/bepi-orb-venus1.xml
@@ -9,7 +9,7 @@
             <ReleaseDate>2021-07-12T11:46:04Z</ReleaseDate>
             <Description>Calculated in IRAP by using Bepi SPICE kernels</Description>
             <Contact>
-                <PersonID>spase://CNES/Person/Benjamin.Renard</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Benjamin.Renard</PersonID>
                 <Role>DataProducer</Role>
             </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Bepi/Ephemeris/bepi-orb-venus2.xml b/NumericalData/CDPP-AMDA/Bepi/Ephemeris/bepi-orb-venus2.xml
index 1bc329e..aae22f9 100644
--- a/NumericalData/CDPP-AMDA/Bepi/Ephemeris/bepi-orb-venus2.xml
+++ b/NumericalData/CDPP-AMDA/Bepi/Ephemeris/bepi-orb-venus2.xml
@@ -9,7 +9,7 @@
             <ReleaseDate>2021-07-12T11:46:04Z</ReleaseDate>
             <Description>Calculated in IRAP by using Bepi SPICE kernels</Description>
             <Contact>
-                <PersonID>spase://CNES/Person/Benjamin.Renard</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Benjamin.Renard</PersonID>
                 <Role>DataProducer</Role>
             </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Bepi/MEA1/bepi-mea1-3d.xml b/NumericalData/CDPP-AMDA/Bepi/MEA1/bepi-mea1-3d.xml
index c2c7d1c..dec1452 100644
--- a/NumericalData/CDPP-AMDA/Bepi/MEA1/bepi-mea1-3d.xml
+++ b/NumericalData/CDPP-AMDA/Bepi/MEA1/bepi-mea1-3d.xml
@@ -8,11 +8,11 @@
       <ReleaseDate>2020-09-09T15:19:00Z</ReleaseDate>
       <Description></Description>
       <Contact>       
-        <PersonID>spase://CNES/Person/Yoshifumi.Saito</PersonID> 
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Yoshifumi.Saito</PersonID> 
         <Role>PrincipalInvestigator</Role>
       </Contact>  
       <Contact>
-        <PersonID>spase://CNES/Person/Nicolas.Andre</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Nicolas.Andre</PersonID>
         <Role>CoInvestigator</Role>
       </Contact>
     </ResourceHeader>
diff --git a/NumericalData/CDPP-AMDA/Bepi/MEA1/bepi-mea1-omni16.xml b/NumericalData/CDPP-AMDA/Bepi/MEA1/bepi-mea1-omni16.xml
index b0e16b9..d6eaf50 100644
--- a/NumericalData/CDPP-AMDA/Bepi/MEA1/bepi-mea1-omni16.xml
+++ b/NumericalData/CDPP-AMDA/Bepi/MEA1/bepi-mea1-omni16.xml
@@ -8,11 +8,11 @@
       <ReleaseDate>2017-10-15T15:19:00Z</ReleaseDate>
       <Description></Description>
       <Contact>       
-        <PersonID>spase://CNES/Person/Yoshifumi.Saito</PersonID> 
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Yoshifumi.Saito</PersonID> 
         <Role>PrincipalInvestigator</Role>
       </Contact>  
       <Contact>
-        <PersonID>spase://CNES/Person/Nicolas.Andre</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Nicolas.Andre</PersonID>
         <Role>CoInvestigator</Role>
       </Contact> 
       <Association>
diff --git a/NumericalData/CDPP-AMDA/Bepi/MEA1/bepi-mea1-pap.xml b/NumericalData/CDPP-AMDA/Bepi/MEA1/bepi-mea1-pap.xml
index 42cc6b2..a74cf31 100644
--- a/NumericalData/CDPP-AMDA/Bepi/MEA1/bepi-mea1-pap.xml
+++ b/NumericalData/CDPP-AMDA/Bepi/MEA1/bepi-mea1-pap.xml
@@ -8,11 +8,11 @@
       <ReleaseDate>2020-09-09T15:19:00Z</ReleaseDate>
       <Description></Description>
       <Contact>       
-        <PersonID>spase://CNES/Person/Yoshifumi.Saito</PersonID> 
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Yoshifumi.Saito</PersonID> 
         <Role>PrincipalInvestigator</Role>
       </Contact>  
       <Contact>
-        <PersonID>spase://CNES/Person/Nicolas.Andre</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Nicolas.Andre</PersonID>
         <Role>CoInvestigator</Role>
       </Contact>  
       <Association>
diff --git a/NumericalData/CDPP-AMDA/Bepi/MEA1/bepi-mea1-pap0.xml b/NumericalData/CDPP-AMDA/Bepi/MEA1/bepi-mea1-pap0.xml
index 71b72e3..5ffe36c 100644
--- a/NumericalData/CDPP-AMDA/Bepi/MEA1/bepi-mea1-pap0.xml
+++ b/NumericalData/CDPP-AMDA/Bepi/MEA1/bepi-mea1-pap0.xml
@@ -8,11 +8,11 @@
       <ReleaseDate>2020-09-09T15:19:00Z</ReleaseDate>
       <Description></Description>
       <Contact>       
-        <PersonID>spase://CNES/Person/Yoshifumi.Saito</PersonID> 
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Yoshifumi.Saito</PersonID> 
         <Role>PrincipalInvestigator</Role>
       </Contact>  
       <Contact>
-        <PersonID>spase://CNES/Person/Nicolas.Andre</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Nicolas.Andre</PersonID>
         <Role>CoInvestigator</Role>
       </Contact>  
       <Association>
diff --git a/NumericalData/CDPP-AMDA/Bepi/MEA1/bepi-mea1-pap1.xml b/NumericalData/CDPP-AMDA/Bepi/MEA1/bepi-mea1-pap1.xml
index ef5af27..b70b913 100644
--- a/NumericalData/CDPP-AMDA/Bepi/MEA1/bepi-mea1-pap1.xml
+++ b/NumericalData/CDPP-AMDA/Bepi/MEA1/bepi-mea1-pap1.xml
@@ -8,11 +8,11 @@
       <ReleaseDate>2020-09-09T15:19:00Z</ReleaseDate>
       <Description></Description>
       <Contact>       
-        <PersonID>spase://CNES/Person/Yoshifumi.Saito</PersonID> 
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Yoshifumi.Saito</PersonID> 
         <Role>PrincipalInvestigator</Role>
       </Contact>  
       <Contact>
-        <PersonID>spase://CNES/Person/Nicolas.Andre</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Nicolas.Andre</PersonID>
         <Role>CoInvestigator</Role>
       </Contact>  
       <Association>
diff --git a/NumericalData/CDPP-AMDA/Bepi/MEA1/bepi-mea1-pap2.xml b/NumericalData/CDPP-AMDA/Bepi/MEA1/bepi-mea1-pap2.xml
index e3ace29..774fa0b 100644
--- a/NumericalData/CDPP-AMDA/Bepi/MEA1/bepi-mea1-pap2.xml
+++ b/NumericalData/CDPP-AMDA/Bepi/MEA1/bepi-mea1-pap2.xml
@@ -8,11 +8,11 @@
       <ReleaseDate>2020-09-09T15:19:00Z</ReleaseDate>
       <Description></Description>
       <Contact>       
-        <PersonID>spase://CNES/Person/Yoshifumi.Saito</PersonID> 
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Yoshifumi.Saito</PersonID> 
         <Role>PrincipalInvestigator</Role>
       </Contact>  
       <Contact>
-        <PersonID>spase://CNES/Person/Nicolas.Andre</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Nicolas.Andre</PersonID>
         <Role>CoInvestigator</Role>
       </Contact>  
       <Association>
diff --git a/NumericalData/CDPP-AMDA/Bepi/MEA1/bepi-mea1-pap3.xml b/NumericalData/CDPP-AMDA/Bepi/MEA1/bepi-mea1-pap3.xml
index c8c87b8..80d734e 100644
--- a/NumericalData/CDPP-AMDA/Bepi/MEA1/bepi-mea1-pap3.xml
+++ b/NumericalData/CDPP-AMDA/Bepi/MEA1/bepi-mea1-pap3.xml
@@ -8,11 +8,11 @@
       <ReleaseDate>2020-09-09T15:19:00Z</ReleaseDate>
       <Description></Description>
       <Contact>       
-        <PersonID>spase://CNES/Person/Yoshifumi.Saito</PersonID> 
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Yoshifumi.Saito</PersonID> 
         <Role>PrincipalInvestigator</Role>
       </Contact>  
       <Contact>
-        <PersonID>spase://CNES/Person/Nicolas.Andre</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Nicolas.Andre</PersonID>
         <Role>CoInvestigator</Role>
       </Contact>  
       <Association>
diff --git a/NumericalData/CDPP-AMDA/Bepi/MEA1/bepi-mea1-vml.xml b/NumericalData/CDPP-AMDA/Bepi/MEA1/bepi-mea1-vml.xml
index 4fa07ef..3d2e7a3 100644
--- a/NumericalData/CDPP-AMDA/Bepi/MEA1/bepi-mea1-vml.xml
+++ b/NumericalData/CDPP-AMDA/Bepi/MEA1/bepi-mea1-vml.xml
@@ -8,11 +8,11 @@
       <ReleaseDate>2020-09-09T15:19:00Z</ReleaseDate>
       <Description></Description>
       <Contact>       
-        <PersonID>spase://CNES/Person/Yoshifumi.Saito</PersonID> 
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Yoshifumi.Saito</PersonID> 
         <Role>PrincipalInvestigator</Role>
       </Contact>  
       <Contact>
-        <PersonID>spase://CNES/Person/Nicolas.Andre</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Nicolas.Andre</PersonID>
         <Role>CoInvestigator</Role>
       </Contact> 
        <Association>
diff --git a/NumericalData/CDPP-AMDA/Bepi/MEA1/bepi-mea1-vml0.xml b/NumericalData/CDPP-AMDA/Bepi/MEA1/bepi-mea1-vml0.xml
index 5089b97..2a818f3 100644
--- a/NumericalData/CDPP-AMDA/Bepi/MEA1/bepi-mea1-vml0.xml
+++ b/NumericalData/CDPP-AMDA/Bepi/MEA1/bepi-mea1-vml0.xml
@@ -8,11 +8,11 @@
       <ReleaseDate>2020-09-09T15:19:00Z</ReleaseDate>
       <Description></Description>
       <Contact>       
-        <PersonID>spase://CNES/Person/Yoshifumi.Saito</PersonID> 
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Yoshifumi.Saito</PersonID> 
         <Role>PrincipalInvestigator</Role>
       </Contact>  
       <Contact>
-        <PersonID>spase://CNES/Person/Nicolas.Andre</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Nicolas.Andre</PersonID>
         <Role>CoInvestigator</Role>
       </Contact>
             <Association>
diff --git a/NumericalData/CDPP-AMDA/Bepi/MEA1/bepi-mea1-vml1.xml b/NumericalData/CDPP-AMDA/Bepi/MEA1/bepi-mea1-vml1.xml
index d44632a..560f692 100644
--- a/NumericalData/CDPP-AMDA/Bepi/MEA1/bepi-mea1-vml1.xml
+++ b/NumericalData/CDPP-AMDA/Bepi/MEA1/bepi-mea1-vml1.xml
@@ -8,11 +8,11 @@
       <ReleaseDate>2020-09-09T15:19:00Z</ReleaseDate>
       <Description></Description>
       <Contact>       
-        <PersonID>spase://CNES/Person/Yoshifumi.Saito</PersonID> 
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Yoshifumi.Saito</PersonID> 
         <Role>PrincipalInvestigator</Role>
       </Contact>  
       <Contact>
-        <PersonID>spase://CNES/Person/Nicolas.Andre</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Nicolas.Andre</PersonID>
         <Role>CoInvestigator</Role>
       </Contact>
             <Association>
diff --git a/NumericalData/CDPP-AMDA/Bepi/MEA1/bepi-mea1-vml2.xml b/NumericalData/CDPP-AMDA/Bepi/MEA1/bepi-mea1-vml2.xml
index 87429e5..6891d3f 100644
--- a/NumericalData/CDPP-AMDA/Bepi/MEA1/bepi-mea1-vml2.xml
+++ b/NumericalData/CDPP-AMDA/Bepi/MEA1/bepi-mea1-vml2.xml
@@ -8,11 +8,11 @@
       <ReleaseDate>2020-09-09T15:19:00Z</ReleaseDate>
       <Description></Description>
       <Contact>       
-        <PersonID>spase://CNES/Person/Yoshifumi.Saito</PersonID> 
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Yoshifumi.Saito</PersonID> 
         <Role>PrincipalInvestigator</Role>
       </Contact>  
       <Contact>
-        <PersonID>spase://CNES/Person/Nicolas.Andre</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Nicolas.Andre</PersonID>
         <Role>CoInvestigator</Role>
       </Contact>
             <Association>
diff --git a/NumericalData/CDPP-AMDA/Bepi/MEA1/bepi-mea1-vml3.xml b/NumericalData/CDPP-AMDA/Bepi/MEA1/bepi-mea1-vml3.xml
index 22c7f62..f9d938e 100644
--- a/NumericalData/CDPP-AMDA/Bepi/MEA1/bepi-mea1-vml3.xml
+++ b/NumericalData/CDPP-AMDA/Bepi/MEA1/bepi-mea1-vml3.xml
@@ -8,11 +8,11 @@
       <ReleaseDate>2020-09-09T15:19:00Z</ReleaseDate>
       <Description></Description>
       <Contact>       
-        <PersonID>spase://CNES/Person/Yoshifumi.Saito</PersonID> 
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Yoshifumi.Saito</PersonID> 
         <Role>PrincipalInvestigator</Role>
       </Contact>  
       <Contact>
-        <PersonID>spase://CNES/Person/Nicolas.Andre</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Nicolas.Andre</PersonID>
         <Role>CoInvestigator</Role>
       </Contact>
             <Association>
diff --git a/NumericalData/CDPP-AMDA/Bepi/MEA1/bepi-mea1-vml4.xml b/NumericalData/CDPP-AMDA/Bepi/MEA1/bepi-mea1-vml4.xml
index f486de4..3896053 100644
--- a/NumericalData/CDPP-AMDA/Bepi/MEA1/bepi-mea1-vml4.xml
+++ b/NumericalData/CDPP-AMDA/Bepi/MEA1/bepi-mea1-vml4.xml
@@ -8,11 +8,11 @@
       <ReleaseDate>2020-09-09T15:19:00Z</ReleaseDate>
       <Description></Description>
       <Contact>       
-        <PersonID>spase://CNES/Person/Yoshifumi.Saito</PersonID> 
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Yoshifumi.Saito</PersonID> 
         <Role>PrincipalInvestigator</Role>
       </Contact>  
       <Contact>
-        <PersonID>spase://CNES/Person/Nicolas.Andre</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Nicolas.Andre</PersonID>
         <Role>CoInvestigator</Role>
       </Contact>
             <Association>
diff --git a/NumericalData/CDPP-AMDA/Bepi/MEA1/bepi-mea1-vml5.xml b/NumericalData/CDPP-AMDA/Bepi/MEA1/bepi-mea1-vml5.xml
index 4020b2e..01b64ca 100644
--- a/NumericalData/CDPP-AMDA/Bepi/MEA1/bepi-mea1-vml5.xml
+++ b/NumericalData/CDPP-AMDA/Bepi/MEA1/bepi-mea1-vml5.xml
@@ -8,11 +8,11 @@
       <ReleaseDate>2020-09-09T15:19:00Z</ReleaseDate>
       <Description></Description>
       <Contact>       
-        <PersonID>spase://CNES/Person/Yoshifumi.Saito</PersonID> 
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Yoshifumi.Saito</PersonID> 
         <Role>PrincipalInvestigator</Role>
       </Contact>  
       <Contact>
-        <PersonID>spase://CNES/Person/Nicolas.Andre</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Nicolas.Andre</PersonID>
         <Role>CoInvestigator</Role>
       </Contact>
             <Association>
diff --git a/NumericalData/CDPP-AMDA/Bepi/MEA2/bepi-mea2-omni16.xml b/NumericalData/CDPP-AMDA/Bepi/MEA2/bepi-mea2-omni16.xml
index 390d79d..83ce202 100644
--- a/NumericalData/CDPP-AMDA/Bepi/MEA2/bepi-mea2-omni16.xml
+++ b/NumericalData/CDPP-AMDA/Bepi/MEA2/bepi-mea2-omni16.xml
@@ -8,11 +8,11 @@
       <ReleaseDate>2017-10-15T15:19:00Z</ReleaseDate>
       <Description></Description>
       <Contact>       
-        <PersonID>spase://CNES/Person/Yoshifumi.Saito</PersonID> 
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Yoshifumi.Saito</PersonID> 
         <Role>PrincipalInvestigator</Role>
       </Contact>  
       <Contact>
-        <PersonID>spase://CNES/Person/Nicolas.Andre</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Nicolas.Andre</PersonID>
         <Role>CoInvestigator</Role>
       </Contact>
       <Association>
diff --git a/NumericalData/CDPP-AMDA/Bepi/MEA2/bepi-mea2-pap.xml b/NumericalData/CDPP-AMDA/Bepi/MEA2/bepi-mea2-pap.xml
index 077cf34..ed5d30f 100644
--- a/NumericalData/CDPP-AMDA/Bepi/MEA2/bepi-mea2-pap.xml
+++ b/NumericalData/CDPP-AMDA/Bepi/MEA2/bepi-mea2-pap.xml
@@ -8,11 +8,11 @@
       <ReleaseDate>2020-09-09T15:19:00Z</ReleaseDate>
       <Description></Description>
       <Contact>       
-        <PersonID>spase://CNES/Person/Yoshifumi.Saito</PersonID> 
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Yoshifumi.Saito</PersonID> 
         <Role>PrincipalInvestigator</Role>
       </Contact>  
       <Contact>
-        <PersonID>spase://CNES/Person/Nicolas.Andre</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Nicolas.Andre</PersonID>
         <Role>CoInvestigator</Role>
       </Contact> 
       <Association>
diff --git a/NumericalData/CDPP-AMDA/Bepi/MEA2/bepi-mea2-pap0.xml b/NumericalData/CDPP-AMDA/Bepi/MEA2/bepi-mea2-pap0.xml
index f1aad88..d9d3199 100644
--- a/NumericalData/CDPP-AMDA/Bepi/MEA2/bepi-mea2-pap0.xml
+++ b/NumericalData/CDPP-AMDA/Bepi/MEA2/bepi-mea2-pap0.xml
@@ -8,11 +8,11 @@
       <ReleaseDate>2020-09-09T15:19:00Z</ReleaseDate>
       <Description></Description>
       <Contact>       
-        <PersonID>spase://CNES/Person/Yoshifumi.Saito</PersonID> 
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Yoshifumi.Saito</PersonID> 
         <Role>PrincipalInvestigator</Role>
       </Contact>  
       <Contact>
-        <PersonID>spase://CNES/Person/Nicolas.Andre</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Nicolas.Andre</PersonID>
         <Role>CoInvestigator</Role>
       </Contact>  
       <Association>
diff --git a/NumericalData/CDPP-AMDA/Bepi/MEA2/bepi-mea2-pap1.xml b/NumericalData/CDPP-AMDA/Bepi/MEA2/bepi-mea2-pap1.xml
index 0adec5b..8c77d9a 100644
--- a/NumericalData/CDPP-AMDA/Bepi/MEA2/bepi-mea2-pap1.xml
+++ b/NumericalData/CDPP-AMDA/Bepi/MEA2/bepi-mea2-pap1.xml
@@ -8,11 +8,11 @@
       <ReleaseDate>2020-09-09T15:19:00Z</ReleaseDate>
       <Description></Description>
       <Contact>       
-        <PersonID>spase://CNES/Person/Yoshifumi.Saito</PersonID> 
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Yoshifumi.Saito</PersonID> 
         <Role>PrincipalInvestigator</Role>
       </Contact>  
       <Contact>
-        <PersonID>spase://CNES/Person/Nicolas.Andre</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Nicolas.Andre</PersonID>
         <Role>CoInvestigator</Role>
       </Contact>  
       <Association>
diff --git a/NumericalData/CDPP-AMDA/Bepi/MEA2/bepi-mea2-pap2.xml b/NumericalData/CDPP-AMDA/Bepi/MEA2/bepi-mea2-pap2.xml
index e13beaf..42de664 100644
--- a/NumericalData/CDPP-AMDA/Bepi/MEA2/bepi-mea2-pap2.xml
+++ b/NumericalData/CDPP-AMDA/Bepi/MEA2/bepi-mea2-pap2.xml
@@ -8,11 +8,11 @@
       <ReleaseDate>2020-09-09T15:19:00Z</ReleaseDate>
       <Description></Description>
       <Contact>       
-        <PersonID>spase://CNES/Person/Yoshifumi.Saito</PersonID> 
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Yoshifumi.Saito</PersonID> 
         <Role>PrincipalInvestigator</Role>
       </Contact>  
       <Contact>
-        <PersonID>spase://CNES/Person/Nicolas.Andre</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Nicolas.Andre</PersonID>
         <Role>CoInvestigator</Role>
       </Contact>  
       <Association>
diff --git a/NumericalData/CDPP-AMDA/Bepi/MEA2/bepi-mea2-pap3.xml b/NumericalData/CDPP-AMDA/Bepi/MEA2/bepi-mea2-pap3.xml
index 72ca43e..98f0c3f 100644
--- a/NumericalData/CDPP-AMDA/Bepi/MEA2/bepi-mea2-pap3.xml
+++ b/NumericalData/CDPP-AMDA/Bepi/MEA2/bepi-mea2-pap3.xml
@@ -8,11 +8,11 @@
       <ReleaseDate>2020-09-09T15:19:00Z</ReleaseDate>
       <Description></Description>
       <Contact>       
-        <PersonID>spase://CNES/Person/Yoshifumi.Saito</PersonID> 
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Yoshifumi.Saito</PersonID> 
         <Role>PrincipalInvestigator</Role>
       </Contact>  
       <Contact>
-        <PersonID>spase://CNES/Person/Nicolas.Andre</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Nicolas.Andre</PersonID>
         <Role>CoInvestigator</Role>
       </Contact>  
       <Association>
diff --git a/NumericalData/CDPP-AMDA/Bepi/MEA2/bepi-mea2-vml.xml b/NumericalData/CDPP-AMDA/Bepi/MEA2/bepi-mea2-vml.xml
index b71851c..ccfe2c1 100644
--- a/NumericalData/CDPP-AMDA/Bepi/MEA2/bepi-mea2-vml.xml
+++ b/NumericalData/CDPP-AMDA/Bepi/MEA2/bepi-mea2-vml.xml
@@ -8,11 +8,11 @@
       <ReleaseDate>2020-09-09T15:19:00Z</ReleaseDate>
       <Description></Description>
       <Contact>       
-        <PersonID>spase://CNES/Person/Yoshifumi.Saito</PersonID> 
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Yoshifumi.Saito</PersonID> 
         <Role>PrincipalInvestigator</Role>
       </Contact>  
       <Contact>
-        <PersonID>spase://CNES/Person/Nicolas.Andre</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Nicolas.Andre</PersonID>
         <Role>CoInvestigator</Role>
       </Contact> 
            <Association>
diff --git a/NumericalData/CDPP-AMDA/Bepi/MEA2/bepi-mea2-vml0.xml b/NumericalData/CDPP-AMDA/Bepi/MEA2/bepi-mea2-vml0.xml
index 507b7e3..d27ac01 100644
--- a/NumericalData/CDPP-AMDA/Bepi/MEA2/bepi-mea2-vml0.xml
+++ b/NumericalData/CDPP-AMDA/Bepi/MEA2/bepi-mea2-vml0.xml
@@ -8,11 +8,11 @@
       <ReleaseDate>2020-09-09T15:19:00Z</ReleaseDate>
       <Description></Description>
       <Contact>       
-        <PersonID>spase://CNES/Person/Yoshifumi.Saito</PersonID> 
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Yoshifumi.Saito</PersonID> 
         <Role>PrincipalInvestigator</Role>
       </Contact>  
       <Contact>
-        <PersonID>spase://CNES/Person/Nicolas.Andre</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Nicolas.Andre</PersonID>
         <Role>CoInvestigator</Role>
       </Contact> 
            <Association>
diff --git a/NumericalData/CDPP-AMDA/Bepi/MEA2/bepi-mea2-vml1.xml b/NumericalData/CDPP-AMDA/Bepi/MEA2/bepi-mea2-vml1.xml
index 2897394..4c9e31d 100644
--- a/NumericalData/CDPP-AMDA/Bepi/MEA2/bepi-mea2-vml1.xml
+++ b/NumericalData/CDPP-AMDA/Bepi/MEA2/bepi-mea2-vml1.xml
@@ -8,11 +8,11 @@
       <ReleaseDate>2020-09-09T15:19:00Z</ReleaseDate>
       <Description></Description>
       <Contact>       
-        <PersonID>spase://CNES/Person/Yoshifumi.Saito</PersonID> 
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Yoshifumi.Saito</PersonID> 
         <Role>PrincipalInvestigator</Role>
       </Contact>  
       <Contact>
-        <PersonID>spase://CNES/Person/Nicolas.Andre</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Nicolas.Andre</PersonID>
         <Role>CoInvestigator</Role>
       </Contact> 
            <Association>
diff --git a/NumericalData/CDPP-AMDA/Bepi/MEA2/bepi-mea2-vml2.xml b/NumericalData/CDPP-AMDA/Bepi/MEA2/bepi-mea2-vml2.xml
index cc3ce8c..3882e32 100644
--- a/NumericalData/CDPP-AMDA/Bepi/MEA2/bepi-mea2-vml2.xml
+++ b/NumericalData/CDPP-AMDA/Bepi/MEA2/bepi-mea2-vml2.xml
@@ -8,11 +8,11 @@
       <ReleaseDate>2020-09-09T15:19:00Z</ReleaseDate>
       <Description></Description>
       <Contact>       
-        <PersonID>spase://CNES/Person/Yoshifumi.Saito</PersonID> 
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Yoshifumi.Saito</PersonID> 
         <Role>PrincipalInvestigator</Role>
       </Contact>  
       <Contact>
-        <PersonID>spase://CNES/Person/Nicolas.Andre</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Nicolas.Andre</PersonID>
         <Role>CoInvestigator</Role>
       </Contact> 
            <Association>
diff --git a/NumericalData/CDPP-AMDA/Bepi/MEA2/bepi-mea2-vml3.xml b/NumericalData/CDPP-AMDA/Bepi/MEA2/bepi-mea2-vml3.xml
index 6ef3a79..fe1054a 100644
--- a/NumericalData/CDPP-AMDA/Bepi/MEA2/bepi-mea2-vml3.xml
+++ b/NumericalData/CDPP-AMDA/Bepi/MEA2/bepi-mea2-vml3.xml
@@ -8,11 +8,11 @@
       <ReleaseDate>2020-09-09T15:19:00Z</ReleaseDate>
       <Description></Description>
       <Contact>       
-        <PersonID>spase://CNES/Person/Yoshifumi.Saito</PersonID> 
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Yoshifumi.Saito</PersonID> 
         <Role>PrincipalInvestigator</Role>
       </Contact>  
       <Contact>
-        <PersonID>spase://CNES/Person/Nicolas.Andre</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Nicolas.Andre</PersonID>
         <Role>CoInvestigator</Role>
       </Contact> 
            <Association>
diff --git a/NumericalData/CDPP-AMDA/Bepi/MEA2/bepi-mea2-vml4.xml b/NumericalData/CDPP-AMDA/Bepi/MEA2/bepi-mea2-vml4.xml
index 8cc93c0..0d32001 100644
--- a/NumericalData/CDPP-AMDA/Bepi/MEA2/bepi-mea2-vml4.xml
+++ b/NumericalData/CDPP-AMDA/Bepi/MEA2/bepi-mea2-vml4.xml
@@ -8,11 +8,11 @@
       <ReleaseDate>2020-09-09T15:19:00Z</ReleaseDate>
       <Description></Description>
       <Contact>       
-        <PersonID>spase://CNES/Person/Yoshifumi.Saito</PersonID> 
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Yoshifumi.Saito</PersonID> 
         <Role>PrincipalInvestigator</Role>
       </Contact>  
       <Contact>
-        <PersonID>spase://CNES/Person/Nicolas.Andre</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Nicolas.Andre</PersonID>
         <Role>CoInvestigator</Role>
       </Contact> 
            <Association>
diff --git a/NumericalData/CDPP-AMDA/Bepi/MEA2/bepi-mea2-vml5.xml b/NumericalData/CDPP-AMDA/Bepi/MEA2/bepi-mea2-vml5.xml
index ee9f47f..92b1ce7 100644
--- a/NumericalData/CDPP-AMDA/Bepi/MEA2/bepi-mea2-vml5.xml
+++ b/NumericalData/CDPP-AMDA/Bepi/MEA2/bepi-mea2-vml5.xml
@@ -8,11 +8,11 @@
       <ReleaseDate>2020-09-09T15:19:00Z</ReleaseDate>
       <Description></Description>
       <Contact>       
-        <PersonID>spase://CNES/Person/Yoshifumi.Saito</PersonID> 
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Yoshifumi.Saito</PersonID> 
         <Role>PrincipalInvestigator</Role>
       </Contact>  
       <Contact>
-        <PersonID>spase://CNES/Person/Nicolas.Andre</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Nicolas.Andre</PersonID>
         <Role>CoInvestigator</Role>
       </Contact> 
            <Association>
diff --git a/NumericalData/CDPP-AMDA/Bepi/MIA/bepi-mia-earth.xml b/NumericalData/CDPP-AMDA/Bepi/MIA/bepi-mia-earth.xml
index 16c0f89..4b8743f 100644
--- a/NumericalData/CDPP-AMDA/Bepi/MIA/bepi-mia-earth.xml
+++ b/NumericalData/CDPP-AMDA/Bepi/MIA/bepi-mia-earth.xml
@@ -8,7 +8,7 @@
       <ReleaseDate>2020-09-09T15:19:00Z</ReleaseDate>
       <Description></Description>
       <Contact>       
-        <PersonID>spase://CNES/Person/Yoshifumi.Saito</PersonID> 
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Yoshifumi.Saito</PersonID> 
         <Role>PrincipalInvestigator</Role>
       </Contact>  
     </ResourceHeader>
diff --git a/NumericalData/CDPP-AMDA/Bepi/MIA/bepi-mia-venus1.xml b/NumericalData/CDPP-AMDA/Bepi/MIA/bepi-mia-venus1.xml
index cee7935..ebd7fcb 100644
--- a/NumericalData/CDPP-AMDA/Bepi/MIA/bepi-mia-venus1.xml
+++ b/NumericalData/CDPP-AMDA/Bepi/MIA/bepi-mia-venus1.xml
@@ -8,7 +8,7 @@
       <ReleaseDate>2020-09-09T15:19:00Z</ReleaseDate>
       <Description></Description>
       <Contact>       
-        <PersonID>spase://CNES/Person/Yoshifumi.Saito</PersonID> 
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Yoshifumi.Saito</PersonID> 
         <Role>PrincipalInvestigator</Role>
       </Contact>  
     </ResourceHeader>
diff --git a/NumericalData/CDPP-AMDA/Bepi/MPO-MAG/bepi-mpo-earth.xml b/NumericalData/CDPP-AMDA/Bepi/MPO-MAG/bepi-mpo-earth.xml
index e881c88..067d85a 100644
--- a/NumericalData/CDPP-AMDA/Bepi/MPO-MAG/bepi-mpo-earth.xml
+++ b/NumericalData/CDPP-AMDA/Bepi/MPO-MAG/bepi-mpo-earth.xml
@@ -15,11 +15,11 @@
                     ELIMINATED YET. ONLY A STEPWISE CONSTANT ESTIMATE OF THE S/C FIELD IS SUBTRACTED.
                     FOR PROPER SCIENTIFIC RESEARCH DERIVED INFLIGHT CALIBRATED DATA SHOULD BE USED</Description>
             <Contact>       
-                    <PersonID>spase://CNES/Person/Daniel.Heyner</PersonID> 
+                    <PersonID>spase://CNES/Person/CDPP-AMDA/Daniel.Heyner</PersonID> 
                     <Role>PrincipalInvestigator</Role>
             </Contact>   
             <Contact>       
-                    <PersonID>spase://CNES/Person/C.Carr</PersonID> 
+                    <PersonID>spase://CNES/Person/CDPP-AMDA/C.Carr</PersonID> 
                     <Role>CoInvestigator</Role>
             </Contact>
     </ResourceHeader>
diff --git a/NumericalData/CDPP-AMDA/Cassini/CAPS/cass-caps-act.xml b/NumericalData/CDPP-AMDA/Cassini/CAPS/cass-caps-act.xml
index 0356eea..d141372 100644
--- a/NumericalData/CDPP-AMDA/Cassini/CAPS/cass-caps-act.xml
+++ b/NumericalData/CDPP-AMDA/Cassini/CAPS/cass-caps-act.xml
@@ -7,7 +7,7 @@
             <ResourceName>detector angle</ResourceName>
             <ReleaseDate>2017-10-05T10:55:00</ReleaseDate>
             <Description/>
-             <Contact><PersonID>spase://CNES/Person/J.Furman</PersonID>
+             <Contact><PersonID>spase://CNES/Person/CDPP-AMDA/J.Furman</PersonID>
                 <Role>DataProducer</Role>
             </Contact>        
         </ResourceHeader>
diff --git a/NumericalData/CDPP-AMDA/Cassini/CAPS/cass-caps-elemo.xml b/NumericalData/CDPP-AMDA/Cassini/CAPS/cass-caps-elemo.xml
index b5ae47e..4b83188 100644
--- a/NumericalData/CDPP-AMDA/Cassini/CAPS/cass-caps-elemo.xml
+++ b/NumericalData/CDPP-AMDA/Cassini/CAPS/cass-caps-elemo.xml
@@ -9,7 +9,7 @@
             <ReleaseDate>2017-10-19T15:51:00</ReleaseDate>
             <Description>Electron moments derived from CAPS/ELS sensor</Description>
             <Contact>
-                <PersonID>spase://CNES/Person/J.Furman</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/J.Furman</PersonID>
                 <Role>DataProducer</Role>
             </Contact>          
         </ResourceHeader>
diff --git a/NumericalData/CDPP-AMDA/Cassini/CAPS/cass-caps-elssec.xml b/NumericalData/CDPP-AMDA/Cassini/CAPS/cass-caps-elssec.xml
index fde70eb..ae9d28f 100644
--- a/NumericalData/CDPP-AMDA/Cassini/CAPS/cass-caps-elssec.xml
+++ b/NumericalData/CDPP-AMDA/Cassini/CAPS/cass-caps-elssec.xml
@@ -9,7 +9,7 @@
             <ReleaseDate>2017-10-12T10:11:00</ReleaseDate>
             <Description>Cassini Plasma Spectrometer (CAPS) Electron Spectrometer (ELS) data</Description>
             <Contact>
-                <PersonID>spase://CNES/Person/J.Furman</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/J.Furman</PersonID>
                 <Role>DataProducer</Role>
             </Contact>     
         </ResourceHeader>
diff --git a/NumericalData/CDPP-AMDA/Cassini/CAPS/cass-caps-fit.xml b/NumericalData/CDPP-AMDA/Cassini/CAPS/cass-caps-fit.xml
index fb98af1..558fd1e 100644
--- a/NumericalData/CDPP-AMDA/Cassini/CAPS/cass-caps-fit.xml
+++ b/NumericalData/CDPP-AMDA/Cassini/CAPS/cass-caps-fit.xml
@@ -19,7 +19,7 @@ For the full details see:
    J. Geophys. Res. Space Physics, 122, 7256–7278,
    doi:10.1002/2017JA024117.</Description>
             <Contact>
-                <PersonID>spase://CNES/Person/R.J.Wilson</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/R.J.Wilson</PersonID>
                 <Role>DataProducer</Role>
             </Contact>            
         </ResourceHeader>
diff --git a/NumericalData/CDPP-AMDA/Cassini/CAPS/cass-caps-ionmo.xml b/NumericalData/CDPP-AMDA/Cassini/CAPS/cass-caps-ionmo.xml
index 6dd3a5b..e5759ec 100644
--- a/NumericalData/CDPP-AMDA/Cassini/CAPS/cass-caps-ionmo.xml
+++ b/NumericalData/CDPP-AMDA/Cassini/CAPS/cass-caps-ionmo.xml
@@ -11,7 +11,7 @@
      the CAPS ion mass spectrometer (IMS)          
      singles or time-of-flight uncalibrated data</Description>
             <Contact>
-                <PersonID>spase://CNES/Person/J.Furman</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/J.Furman</PersonID>
                 <Role>DataProducer</Role>
             </Contact>            
         </ResourceHeader>
diff --git a/NumericalData/CDPP-AMDA/Cassini/CAPS/cass-caps-scpot.xml b/NumericalData/CDPP-AMDA/Cassini/CAPS/cass-caps-scpot.xml
index a5002ff..b790cf9 100644
--- a/NumericalData/CDPP-AMDA/Cassini/CAPS/cass-caps-scpot.xml
+++ b/NumericalData/CDPP-AMDA/Cassini/CAPS/cass-caps-scpot.xml
@@ -11,7 +11,7 @@
      from the Cassini Plasma Spectrometer (CAPS) electron spectrometer        
      uncalibrated data</Description>
             <Contact>
-                <PersonID>spase://CNES/Person/J.Furman</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/J.Furman</PersonID>
                 <Role>DataProducer</Role>
             </Contact>              
         </ResourceHeader>
diff --git a/NumericalData/CDPP-AMDA/Cassini/CAPS/cass-caps-snghr.xml b/NumericalData/CDPP-AMDA/Cassini/CAPS/cass-caps-snghr.xml
index db3ea42..f78077d 100644
--- a/NumericalData/CDPP-AMDA/Cassini/CAPS/cass-caps-snghr.xml
+++ b/NumericalData/CDPP-AMDA/Cassini/CAPS/cass-caps-snghr.xml
@@ -8,7 +8,7 @@
             <ReleaseDate>2017-10-12T10:12:00</ReleaseDate>
             <Description>Cassini Plasma Spectrometer (CAPS) Ion Mass Spectrometer (IMS) data obtained from NASA/PDS plasma node</Description>
            <Contact>
-                <PersonID>spase://CNES/Person/J.Furman</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/J.Furman</PersonID>
                 <Role>DataProducer</Role>
             </Contact>     
         </ResourceHeader>
diff --git a/NumericalData/CDPP-AMDA/Cassini/Ephemeris/cass-ephem-eqt.xml b/NumericalData/CDPP-AMDA/Cassini/Ephemeris/cass-ephem-eqt.xml
index ea17ab6..a3aae43 100644
--- a/NumericalData/CDPP-AMDA/Cassini/Ephemeris/cass-ephem-eqt.xml
+++ b/NumericalData/CDPP-AMDA/Cassini/Ephemeris/cass-ephem-eqt.xml
@@ -9,7 +9,7 @@
             <ReleaseDate>2017-10-06T10:30:00</ReleaseDate>
             <Description>Ephemeris of the Cassini spacecraft around Jupiter (during the Jupiter flyby in 2000-2001) are calculated by Joseph Groene tool (University of Iowa).</Description>            
              <Contact>       
-                 <PersonID>spase://CNES/Person/Joseph.Groene</PersonID> 
+                 <PersonID>spase://CNES/Person/CDPP-AMDA/Joseph.Groene</PersonID> 
                  <Role>DataProducer</Role>
              </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Cassini/Ephemeris/cass-ephem-polar.xml b/NumericalData/CDPP-AMDA/Cassini/Ephemeris/cass-ephem-polar.xml
index b7e2372..9a22a37 100644
--- a/NumericalData/CDPP-AMDA/Cassini/Ephemeris/cass-ephem-polar.xml
+++ b/NumericalData/CDPP-AMDA/Cassini/Ephemeris/cass-ephem-polar.xml
@@ -12,7 +12,7 @@
                 *  L-shell (assuming dipolar magnetic field)
                 *  Local Time </Description>
              <Contact>       
-                <PersonID>spase://CNES/Person/Joseph.Groene</PersonID> 
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Joseph.Groene</PersonID> 
                 <Role>DataProducer</Role>
             </Contact> 
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Cassini/Ephemeris/cass-ephem-sls3.xml b/NumericalData/CDPP-AMDA/Cassini/Ephemeris/cass-ephem-sls3.xml
index 5f5811a..70dcc81 100644
--- a/NumericalData/CDPP-AMDA/Cassini/Ephemeris/cass-ephem-sls3.xml
+++ b/NumericalData/CDPP-AMDA/Cassini/Ephemeris/cass-ephem-sls3.xml
@@ -10,7 +10,7 @@
             <Description>Cassini western longitude around Saturn based on Cassini SKR measurements. SLS3 longitude system is described here: 
       Kurth et al. "An Update to a Saturnian Longitude System Based on Kilometric Radio Emissions", 2007, JGR. It is calculated by Joseph Groene tool (University of Iowa)</Description>
              <Contact>       
-                <PersonID>spase://CNES/Person/Joseph.Groene</PersonID> 
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Joseph.Groene</PersonID> 
                 <Role>DataProducer</Role>
             </Contact> 
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Cassini/Ephemeris/cass-orb-1s.xml b/NumericalData/CDPP-AMDA/Cassini/Ephemeris/cass-orb-1s.xml
index c1838bb..8fa2099 100644
--- a/NumericalData/CDPP-AMDA/Cassini/Ephemeris/cass-orb-1s.xml
+++ b/NumericalData/CDPP-AMDA/Cassini/Ephemeris/cass-orb-1s.xml
@@ -9,11 +9,11 @@
             <ReleaseDate>2018-04-13T12:53:01Z</ReleaseDate>
             <Description>Cassini Ephemeris are calculated in IRAP by using Cassini SPICE kernels</Description>
              <Contact>       
-                 <PersonID>spase://CNES/Person/NAIF</PersonID> 
+                 <PersonID>spase://CNES/Person/CDPP-AMDA/NAIF</PersonID> 
                  <Role>PrincipalInvestigator</Role>
              </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/Elena.Budnik</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Elena.Budnik</PersonID>
                 <Role>TechnicalContact</Role>
             </Contact>
             <Association>
diff --git a/NumericalData/CDPP-AMDA/Cassini/Ephemeris/cass-orb-60s.xml b/NumericalData/CDPP-AMDA/Cassini/Ephemeris/cass-orb-60s.xml
index 4bd8fad..fbe60bf 100644
--- a/NumericalData/CDPP-AMDA/Cassini/Ephemeris/cass-orb-60s.xml
+++ b/NumericalData/CDPP-AMDA/Cassini/Ephemeris/cass-orb-60s.xml
@@ -9,11 +9,11 @@
             <ReleaseDate>2018-04-11T00:01:33Z</ReleaseDate>
             <Description>Cassini Ephemeris are calculated in IRAP by using Cassini SPICE kernels</Description>
              <Contact>       
-                 <PersonID>spase://CNES/Person/NAIF</PersonID> 
+                 <PersonID>spase://CNES/Person/CDPP-AMDA/NAIF</PersonID> 
                  <Role>PrincipalInvestigator</Role>
              </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/Elena.Budnik</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Elena.Budnik</PersonID>
                 <Role>TechnicalContact</Role>
             </Contact>
             <Association>
diff --git a/NumericalData/CDPP-AMDA/Cassini/Ephemeris/cass-orb-cruise.xml b/NumericalData/CDPP-AMDA/Cassini/Ephemeris/cass-orb-cruise.xml
index 73433d8..dc0f0de 100644
--- a/NumericalData/CDPP-AMDA/Cassini/Ephemeris/cass-orb-cruise.xml
+++ b/NumericalData/CDPP-AMDA/Cassini/Ephemeris/cass-orb-cruise.xml
@@ -9,11 +9,11 @@
             <ReleaseDate>2017-10-15T14:40:00.000Z</ReleaseDate>
             <Description>Calculated in IRAP by using Cassini SPICE kernels</Description>
              <Contact>       
-                 <PersonID>spase://CNES/Person/NAIF</PersonID> 
+                 <PersonID>spase://CNES/Person/CDPP-AMDA/NAIF</PersonID> 
                  <Role>PrincipalInvestigator</Role>
              </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/Elena.Budnik</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Elena.Budnik</PersonID>
                 <Role>TechnicalContact</Role>
             </Contact>
         </ResourceHeader>
diff --git a/NumericalData/CDPP-AMDA/Cassini/Ephemeris/cass-orb-saturn.xml b/NumericalData/CDPP-AMDA/Cassini/Ephemeris/cass-orb-saturn.xml
index 7512bd9..92fa00a 100644
--- a/NumericalData/CDPP-AMDA/Cassini/Ephemeris/cass-orb-saturn.xml
+++ b/NumericalData/CDPP-AMDA/Cassini/Ephemeris/cass-orb-saturn.xml
@@ -9,11 +9,11 @@
             <ReleaseDate>2018-04-11T00:01:33Z</ReleaseDate>
             <Description>Cassini Ephemeris are calculated in IRAP by using Cassini SPICE kernels</Description>
              <Contact>       
-                 <PersonID>spase://CNES/Person/NAIF</PersonID> 
+                 <PersonID>spase://CNES/Person/CDPP-AMDA/NAIF</PersonID> 
                  <Role>PrincipalInvestigator</Role>
              </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/Elena.Budnik</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Elena.Budnik</PersonID>
                 <Role>TechnicalContact</Role>
             </Contact>
             <Association>
diff --git a/NumericalData/CDPP-AMDA/Cassini/Ephemeris/cass-sls4-north.xml b/NumericalData/CDPP-AMDA/Cassini/Ephemeris/cass-sls4-north.xml
index 156c3f2..502d27a 100644
--- a/NumericalData/CDPP-AMDA/Cassini/Ephemeris/cass-sls4-north.xml
+++ b/NumericalData/CDPP-AMDA/Cassini/Ephemeris/cass-sls4-north.xml
@@ -14,7 +14,7 @@
                Calculated by Joseph Groen tool (University of Iowa).  Two longitudes are available
             sub-spacecraft and sub-solar</Description>
             <Contact>       
-                <PersonID>spase://CNES/Person/Joseph.Groene</PersonID> 
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Joseph.Groene</PersonID> 
                 <Role>DataProducer</Role>
             </Contact> 
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Cassini/Ephemeris/cass-sls4-south.xml b/NumericalData/CDPP-AMDA/Cassini/Ephemeris/cass-sls4-south.xml
index 2451c8b..0491a4e 100644
--- a/NumericalData/CDPP-AMDA/Cassini/Ephemeris/cass-sls4-south.xml
+++ b/NumericalData/CDPP-AMDA/Cassini/Ephemeris/cass-sls4-south.xml
@@ -12,7 +12,7 @@
                   Calculated by Joseph Groen tool (University of Iowa). Two longitudes are available
             sub-spacecraft and sub-solar</Description>
             <Contact>       
-                <PersonID>spase://CNES/Person/Joseph.Groene</PersonID> 
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Joseph.Groene</PersonID> 
                 <Role>DataProducer</Role>
             </Contact>            
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Cassini/MAG/Saturn_Orbit/cass-mag-krtphr.xml b/NumericalData/CDPP-AMDA/Cassini/MAG/Saturn_Orbit/cass-mag-krtphr.xml
index 19bfe92..47a60be 100644
--- a/NumericalData/CDPP-AMDA/Cassini/MAG/Saturn_Orbit/cass-mag-krtphr.xml
+++ b/NumericalData/CDPP-AMDA/Cassini/MAG/Saturn_Orbit/cass-mag-krtphr.xml
@@ -9,11 +9,11 @@
             <ReleaseDate>2017-10-12T16:00:00</ReleaseDate>
             <Description>High-resolution magnetic field data from the Cassini magnetometer during the Saturn orbital phase in KRTP coordinates obtained from NASA/PDS plasma node</Description>
             <Contact>
-                <PersonID>spase://CNES/Person/Michele.Dougherty</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Michele.Dougherty</PersonID>
                 <Role>PrincipalInvestigator</Role>                
             </Contact>
            <Contact>
-                <PersonID>spase://CNES/Person/Steve.Kellock</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Steve.Kellock</PersonID>
                 <Role>DataProducer</Role>
             </Contact>  
             <Association>
diff --git a/NumericalData/CDPP-AMDA/Cassini/MAG/Saturn_Orbit/cass-mag-orb1.xml b/NumericalData/CDPP-AMDA/Cassini/MAG/Saturn_Orbit/cass-mag-orb1.xml
index da0f1fe..d54b195 100644
--- a/NumericalData/CDPP-AMDA/Cassini/MAG/Saturn_Orbit/cass-mag-orb1.xml
+++ b/NumericalData/CDPP-AMDA/Cassini/MAG/Saturn_Orbit/cass-mag-orb1.xml
@@ -13,11 +13,11 @@
    * RTN : R (radial component, Sun to the spacecraft), T (tangential component, parallel to the Solar Equatorial plane and perpendicular to R), and N (normal component, completes right handed set)
             </Description>
             <Contact>
-                <PersonID>spase://CNES/Person/Michele.Dougherty</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Michele.Dougherty</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/Steve.Kellock</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Steve.Kellock</PersonID>
                 <Role>DataProducer</Role>
             </Contact> 
             <Association>
diff --git a/NumericalData/CDPP-AMDA/Cassini/MAG/Saturn_Orbit/cass-mag-orb60.xml b/NumericalData/CDPP-AMDA/Cassini/MAG/Saturn_Orbit/cass-mag-orb60.xml
index 59b0853..db24538 100644
--- a/NumericalData/CDPP-AMDA/Cassini/MAG/Saturn_Orbit/cass-mag-orb60.xml
+++ b/NumericalData/CDPP-AMDA/Cassini/MAG/Saturn_Orbit/cass-mag-orb60.xml
@@ -13,11 +13,11 @@
    * RTN : R (radial component, Sun to the spacecraft), T (tangential component, parallel to the Solar Equatorial plane and perpendicular to R), and N (normal component, completes right handed set)
             </Description>
             <Contact>
-                <PersonID>spase://CNES/Person/Michele.Dougherty</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Michele.Dougherty</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/Steve.Kellock</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Steve.Kellock</PersonID>
                 <Role>DataProducer</Role>
             </Contact> 
             <Association>
diff --git a/NumericalData/CDPP-AMDA/Cassini/MAG/cass-mag-jup.xml b/NumericalData/CDPP-AMDA/Cassini/MAG/cass-mag-jup.xml
index b028477..273734a 100644
--- a/NumericalData/CDPP-AMDA/Cassini/MAG/cass-mag-jup.xml
+++ b/NumericalData/CDPP-AMDA/Cassini/MAG/cass-mag-jup.xml
@@ -12,11 +12,11 @@
               * RTN - RTN coordinates consist of R (radial component, Sun to the spacecraft), T (tangential component, parallel to the Solar Equatorial plane and perpendicular to R), and N (normal component, completes right handed set).  
             </Description>
             <Contact>
-                <PersonID>spase://CNES/Person/Michele.Dougherty</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Michele.Dougherty</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/Steve.Kellock</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Steve.Kellock</PersonID>
                 <Role>DataProducer</Role>
             </Contact> 
         </ResourceHeader>
diff --git a/NumericalData/CDPP-AMDA/Cassini/MAG/cass-mag-rtn1.xml b/NumericalData/CDPP-AMDA/Cassini/MAG/cass-mag-rtn1.xml
index a2dfe19..b4f908b 100644
--- a/NumericalData/CDPP-AMDA/Cassini/MAG/cass-mag-rtn1.xml
+++ b/NumericalData/CDPP-AMDA/Cassini/MAG/cass-mag-rtn1.xml
@@ -10,11 +10,11 @@
    * RTN : R (radial component, Sun to the spacecraft), T (tangential component, parallel to the Solar Equatorial plane and perpendicular to R), and N (normal component, completes right handed set)
             </Description>
             <Contact>
-                <PersonID>spase://CNES/Person/Michele.Dougherty</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Michele.Dougherty</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/Steve.Kellock</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Steve.Kellock</PersonID>
                 <Role>DataProducer</Role>
             </Contact> 
             <Association>
diff --git a/NumericalData/CDPP-AMDA/Cassini/MAG/cass-mag-rtn60.xml b/NumericalData/CDPP-AMDA/Cassini/MAG/cass-mag-rtn60.xml
index 4eaf2ea..7b14334 100644
--- a/NumericalData/CDPP-AMDA/Cassini/MAG/cass-mag-rtn60.xml
+++ b/NumericalData/CDPP-AMDA/Cassini/MAG/cass-mag-rtn60.xml
@@ -10,11 +10,11 @@
    * RTN : R (radial component, Sun to the spacecraft), T (tangential component, parallel to the Solar Equatorial plane and perpendicular to R), and N (normal component, completes right handed set)
             </Description>
             <Contact>
-                <PersonID>spase://CNES/Person/Michele.Dougherty</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Michele.Dougherty</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/Steve.Kellock</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Steve.Kellock</PersonID>
                 <Role>DataProducer</Role>
             </Contact> 
             <Association>
diff --git a/NumericalData/CDPP-AMDA/Cassini/MIMI-LEMMS/cass-lemms-acc1hour.xml b/NumericalData/CDPP-AMDA/Cassini/MIMI-LEMMS/cass-lemms-acc1hour.xml
index a463e6c..2e1e78f 100644
--- a/NumericalData/CDPP-AMDA/Cassini/MIMI-LEMMS/cass-lemms-acc1hour.xml
+++ b/NumericalData/CDPP-AMDA/Cassini/MIMI-LEMMS/cass-lemms-acc1hour.xml
@@ -16,7 +16,7 @@
     900 keV. The E0 through E4 channels are also electrons covering the 150 to
     3000 keV range.</Description>
             <Contact>
-                <PersonID>spase://CNES/Person/Jon.Vandegriff</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Jon.Vandegriff</PersonID>
                 <Role>DataProducer</Role>
             </Contact>                       
             <Association>
diff --git a/NumericalData/CDPP-AMDA/Cassini/MIMI-LEMMS/cass-lemms-acc1min.xml b/NumericalData/CDPP-AMDA/Cassini/MIMI-LEMMS/cass-lemms-acc1min.xml
index d128a90..1fb7055 100644
--- a/NumericalData/CDPP-AMDA/Cassini/MIMI-LEMMS/cass-lemms-acc1min.xml
+++ b/NumericalData/CDPP-AMDA/Cassini/MIMI-LEMMS/cass-lemms-acc1min.xml
@@ -16,7 +16,7 @@
     900 keV. The E0 through E4 channels are also electrons covering the 150 to
     3000 keV range.</Description>
              <Contact>
-                <PersonID>spase://CNES/Person/Jon.Vandegriff</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Jon.Vandegriff</PersonID>
                 <Role>DataProducer</Role>
             </Contact>     
             <Association>
diff --git a/NumericalData/CDPP-AMDA/Cassini/MIMI-LEMMS/cass-lemms-pha1hour.xml b/NumericalData/CDPP-AMDA/Cassini/MIMI-LEMMS/cass-lemms-pha1hour.xml
index 9a54586..2ef58b6 100644
--- a/NumericalData/CDPP-AMDA/Cassini/MIMI-LEMMS/cass-lemms-pha1hour.xml
+++ b/NumericalData/CDPP-AMDA/Cassini/MIMI-LEMMS/cass-lemms-pha1hour.xml
@@ -13,7 +13,7 @@
     (energies of 26-758 keV). For the E channels, indices 15 to 62 (20-410
     keV), and for F1, 26 through 59 (206-1717 keV).</Description>
             <Contact>
-                <PersonID>spase://CNES/Person/Jon.Vandegriff</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Jon.Vandegriff</PersonID>
                 <Role>DataProducer</Role>
             </Contact>
             <Association>
diff --git a/NumericalData/CDPP-AMDA/Cassini/MIMI-LEMMS/cass-lemms-pha1min.xml b/NumericalData/CDPP-AMDA/Cassini/MIMI-LEMMS/cass-lemms-pha1min.xml
index 461ecfe..3fe5cea 100644
--- a/NumericalData/CDPP-AMDA/Cassini/MIMI-LEMMS/cass-lemms-pha1min.xml
+++ b/NumericalData/CDPP-AMDA/Cassini/MIMI-LEMMS/cass-lemms-pha1min.xml
@@ -13,7 +13,7 @@
     (energies of 26-758 keV). For the E channels, indices 15 to 62 (20-410
     keV), and for F1, 26 through 59 (206-1717 keV).</Description>
             <Contact>
-                <PersonID>spase://CNES/Person/Jon.Vandegriff</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Jon.Vandegriff</PersonID>
                 <Role>DataProducer</Role>
             </Contact> 
             <Association>
diff --git a/NumericalData/CDPP-AMDA/Cassini/Moons_Ephemeris/dione-ephem-polar.xml b/NumericalData/CDPP-AMDA/Cassini/Moons_Ephemeris/dione-ephem-polar.xml
index 6810298..553f1fc 100644
--- a/NumericalData/CDPP-AMDA/Cassini/Moons_Ephemeris/dione-ephem-polar.xml
+++ b/NumericalData/CDPP-AMDA/Cassini/Moons_Ephemeris/dione-ephem-polar.xml
@@ -12,7 +12,7 @@
                 *  Local Time</Description>
          <Acknowledgement/>                     
          <Contact>
-            <PersonID>spase://CNES/Person/Joseph.Groene</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Joseph.Groene</PersonID>
             <Role>DataProducer</Role>
          </Contact> 
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Cassini/Moons_Ephemeris/dione-orb-sls3.xml b/NumericalData/CDPP-AMDA/Cassini/Moons_Ephemeris/dione-orb-sls3.xml
index bb7cf96..82f32bf 100644
--- a/NumericalData/CDPP-AMDA/Cassini/Moons_Ephemeris/dione-orb-sls3.xml
+++ b/NumericalData/CDPP-AMDA/Cassini/Moons_Ephemeris/dione-orb-sls3.xml
@@ -9,7 +9,7 @@
          <Description>Dione western longitude around Saturn based on Cassini SKR measurements. SLS3 longitude system is described here: Kurth et al. "An Update to a Saturnian Longitude System Based on Kilometric Radio Emissions", 2007, JGR. It is calculated by Joseph Groene tool (University of Iowa)</Description>
          <Acknowledgement/>                     
          <Contact>
-            <PersonID>spase://CNES/Person/Joseph.Groene</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Joseph.Groene</PersonID>
             <Role>DataProducer</Role>
          </Contact> 
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Cassini/Moons_Ephemeris/encelad-ephem-pol.xml b/NumericalData/CDPP-AMDA/Cassini/Moons_Ephemeris/encelad-ephem-pol.xml
index caf535c..9833774 100644
--- a/NumericalData/CDPP-AMDA/Cassini/Moons_Ephemeris/encelad-ephem-pol.xml
+++ b/NumericalData/CDPP-AMDA/Cassini/Moons_Ephemeris/encelad-ephem-pol.xml
@@ -12,7 +12,7 @@
                 *  Local Time</Description>
          <Acknowledgement/>                     
          <Contact>
-            <PersonID>spase://CNES/Person/Joseph.Groene</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Joseph.Groene</PersonID>
             <Role>DataProducer</Role>
          </Contact> 
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Cassini/Moons_Ephemeris/encelad-orb-sls3.xml b/NumericalData/CDPP-AMDA/Cassini/Moons_Ephemeris/encelad-orb-sls3.xml
index f42799e..d833dae 100644
--- a/NumericalData/CDPP-AMDA/Cassini/Moons_Ephemeris/encelad-orb-sls3.xml
+++ b/NumericalData/CDPP-AMDA/Cassini/Moons_Ephemeris/encelad-orb-sls3.xml
@@ -9,7 +9,7 @@
          <Description>Enceladus western longitude around Saturn based on Cassini SKR measurements. SLS3 longitude system is described here: Kurth et al. "An Update to a Saturnian Longitude System Based on Kilometric Radio Emissions", 2007, JGR. It is calculated by Joseph Groene tool (University of Iowa)</Description>
          <Acknowledgement/>                     
          <Contact>
-            <PersonID>spase://CNES/Person/Joseph.Groene</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Joseph.Groene</PersonID>
             <Role>DataProducer</Role>
          </Contact> 
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Cassini/Moons_Ephemeris/mimas-ephem-polar.xml b/NumericalData/CDPP-AMDA/Cassini/Moons_Ephemeris/mimas-ephem-polar.xml
index e11ab23..6819a1c 100644
--- a/NumericalData/CDPP-AMDA/Cassini/Moons_Ephemeris/mimas-ephem-polar.xml
+++ b/NumericalData/CDPP-AMDA/Cassini/Moons_Ephemeris/mimas-ephem-polar.xml
@@ -12,7 +12,7 @@
                 *  Local Time</Description>
          <Acknowledgement/>                     
          <Contact>
-            <PersonID>spase://CNES/Person/Joseph.Groene</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Joseph.Groene</PersonID>
             <Role>DataProducer</Role>
          </Contact> 
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Cassini/Moons_Ephemeris/mimas-orb-sls3.xml b/NumericalData/CDPP-AMDA/Cassini/Moons_Ephemeris/mimas-orb-sls3.xml
index 63c1b61..8303790 100644
--- a/NumericalData/CDPP-AMDA/Cassini/Moons_Ephemeris/mimas-orb-sls3.xml
+++ b/NumericalData/CDPP-AMDA/Cassini/Moons_Ephemeris/mimas-orb-sls3.xml
@@ -9,7 +9,7 @@
          <Description>Mimas western longitude around Saturn based on Cassini SKR measurements. SLS3 longitude system is described here: Kurth et al. "An Update to a Saturnian Longitude System Based on Kilometric Radio Emissions", 2007, JGR. It is calculated by Joseph Groene tool (University of Iowa)</Description>
          <Acknowledgement/>                     
          <Contact>
-            <PersonID>spase://CNES/Person/Joseph.Groene</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Joseph.Groene</PersonID>
             <Role>DataProducer</Role>
          </Contact> 
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Cassini/Moons_Ephemeris/rhea-ephem-polar.xml b/NumericalData/CDPP-AMDA/Cassini/Moons_Ephemeris/rhea-ephem-polar.xml
index eb4921b..7b15a14 100644
--- a/NumericalData/CDPP-AMDA/Cassini/Moons_Ephemeris/rhea-ephem-polar.xml
+++ b/NumericalData/CDPP-AMDA/Cassini/Moons_Ephemeris/rhea-ephem-polar.xml
@@ -12,7 +12,7 @@
                 *  Local Time</Description>
          <Acknowledgement/>                     
          <Contact>
-            <PersonID>spase://CNES/Person/Joseph.Groene</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Joseph.Groene</PersonID>
             <Role>DataProducer</Role>
          </Contact> 
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Cassini/Moons_Ephemeris/rhea-orb-sls3.xml b/NumericalData/CDPP-AMDA/Cassini/Moons_Ephemeris/rhea-orb-sls3.xml
index 4d3f3ca..7e5ba1e 100644
--- a/NumericalData/CDPP-AMDA/Cassini/Moons_Ephemeris/rhea-orb-sls3.xml
+++ b/NumericalData/CDPP-AMDA/Cassini/Moons_Ephemeris/rhea-orb-sls3.xml
@@ -9,7 +9,7 @@
          <Description>Rhea western longitude around Saturn based on Cassini SKR measurements. SLS3 longitude system is described here: Kurth et al. "An Update to a Saturnian Longitude System Based on Kilometric Radio Emissions", 2007, JGR. It is calculated by Joseph Groene tool (University of Iowa)</Description>
          <Acknowledgement/>                     
          <Contact>
-            <PersonID>spase://CNES/Person/Joseph.Groene</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Joseph.Groene</PersonID>
             <Role>DataProducer</Role>
          </Contact> 
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Cassini/Moons_Ephemeris/tethys-ephem-pol.xml b/NumericalData/CDPP-AMDA/Cassini/Moons_Ephemeris/tethys-ephem-pol.xml
index 621f7fe..24f2171 100644
--- a/NumericalData/CDPP-AMDA/Cassini/Moons_Ephemeris/tethys-ephem-pol.xml
+++ b/NumericalData/CDPP-AMDA/Cassini/Moons_Ephemeris/tethys-ephem-pol.xml
@@ -12,7 +12,7 @@
                 *  Local Time</Description>
          <Acknowledgement/>                     
          <Contact>
-            <PersonID>spase://CNES/Person/Joseph.Groene</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Joseph.Groene</PersonID>
             <Role>DataProducer</Role>
          </Contact> 
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Cassini/Moons_Ephemeris/tethys-orb-sls3.xml b/NumericalData/CDPP-AMDA/Cassini/Moons_Ephemeris/tethys-orb-sls3.xml
index d647eb3..13dabc0 100644
--- a/NumericalData/CDPP-AMDA/Cassini/Moons_Ephemeris/tethys-orb-sls3.xml
+++ b/NumericalData/CDPP-AMDA/Cassini/Moons_Ephemeris/tethys-orb-sls3.xml
@@ -9,7 +9,7 @@
          <Description>Tethys western longitude around Saturn based on Cassini SKR measurements. SLS3 longitude system is described here: Kurth et al. "An Update to a Saturnian Longitude System Based on Kilometric Radio Emissions", 2007, JGR. It is calculated by Joseph Groene tool (University of Iowa)</Description>
          <Acknowledgement/>                     
          <Contact>
-            <PersonID>spase://CNES/Person/Joseph.Groene</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Joseph.Groene</PersonID>
             <Role>DataProducer</Role>
          </Contact> 
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Cassini/Moons_Ephemeris/titan-ephem-polar.xml b/NumericalData/CDPP-AMDA/Cassini/Moons_Ephemeris/titan-ephem-polar.xml
index db9ef7f..791bd5e 100644
--- a/NumericalData/CDPP-AMDA/Cassini/Moons_Ephemeris/titan-ephem-polar.xml
+++ b/NumericalData/CDPP-AMDA/Cassini/Moons_Ephemeris/titan-ephem-polar.xml
@@ -12,7 +12,7 @@
                 *  Local Time</Description>
          <Acknowledgement/>                     
          <Contact>
-            <PersonID>spase://CNES/Person/Joseph.Groene</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Joseph.Groene</PersonID>
             <Role>DataProducer</Role>
          </Contact> 
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Cassini/Moons_Ephemeris/titan-orb-sls3.xml b/NumericalData/CDPP-AMDA/Cassini/Moons_Ephemeris/titan-orb-sls3.xml
index a289fc9..656c383 100644
--- a/NumericalData/CDPP-AMDA/Cassini/Moons_Ephemeris/titan-orb-sls3.xml
+++ b/NumericalData/CDPP-AMDA/Cassini/Moons_Ephemeris/titan-orb-sls3.xml
@@ -9,7 +9,7 @@
          <Description>Titan western longitude around Saturn based on Cassini SKR measurements. SLS3 longitude system is described here: Kurth et al. "An Update to a Saturnian Longitude System Based on Kilometric Radio Emissions", 2007, JGR. It is calculated by Joseph Groene tool (University of Iowa)</Description>
          <Acknowledgement/>                     
          <Contact>
-            <PersonID>spase://CNES/Person/Joseph.Groene</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Joseph.Groene</PersonID>
             <Role>DataProducer</Role>
          </Contact> 
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Cassini/RPWS/cass-fpe-earth.xml b/NumericalData/CDPP-AMDA/Cassini/RPWS/cass-fpe-earth.xml
index c83b969..2893790 100644
--- a/NumericalData/CDPP-AMDA/Cassini/RPWS/cass-fpe-earth.xml
+++ b/NumericalData/CDPP-AMDA/Cassini/RPWS/cass-fpe-earth.xml
@@ -19,7 +19,7 @@
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/J.Wahlund</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/J.Wahlund</PersonID>
                 <Role>DataProducer</Role>
             </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Cassini/RPWS/cass-fpe-encel.xml b/NumericalData/CDPP-AMDA/Cassini/RPWS/cass-fpe-encel.xml
index dd8453b..e5cffee 100644
--- a/NumericalData/CDPP-AMDA/Cassini/RPWS/cass-fpe-encel.xml
+++ b/NumericalData/CDPP-AMDA/Cassini/RPWS/cass-fpe-encel.xml
@@ -19,7 +19,7 @@
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/J.Wahlund</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/J.Wahlund</PersonID>
                 <Role>DataProducer</Role>
             </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Cassini/RPWS/cass-fpe-jup.xml b/NumericalData/CDPP-AMDA/Cassini/RPWS/cass-fpe-jup.xml
index 69fbba8..d86d04e 100644
--- a/NumericalData/CDPP-AMDA/Cassini/RPWS/cass-fpe-jup.xml
+++ b/NumericalData/CDPP-AMDA/Cassini/RPWS/cass-fpe-jup.xml
@@ -19,7 +19,7 @@
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/J.Wahlund</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/J.Wahlund</PersonID>
                 <Role>DataProducer</Role>
             </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Cassini/RPWS/cass-fpe-sat.xml b/NumericalData/CDPP-AMDA/Cassini/RPWS/cass-fpe-sat.xml
index 240aa8d..cab6b7b 100644
--- a/NumericalData/CDPP-AMDA/Cassini/RPWS/cass-fpe-sat.xml
+++ b/NumericalData/CDPP-AMDA/Cassini/RPWS/cass-fpe-sat.xml
@@ -19,7 +19,7 @@
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/J.Wahlund</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/J.Wahlund</PersonID>
                 <Role>DataProducer</Role>
             </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Cassini/RPWS/cass-lp-ni.xml b/NumericalData/CDPP-AMDA/Cassini/RPWS/cass-lp-ni.xml
index 936e293..5089d36 100644
--- a/NumericalData/CDPP-AMDA/Cassini/RPWS/cass-lp-ni.xml
+++ b/NumericalData/CDPP-AMDA/Cassini/RPWS/cass-lp-ni.xml
@@ -10,7 +10,7 @@
             <Description>Densities are derived from the voltage sweeps of the Cassini Langmuir probe. The data reduction method is described in detail in Holmberg et al. 2012 and Holmberg et al. 2017.
             The Cassini RPWS/LP data are available at the University of Iowa and the Swedish Institute of Space Physics. The Swedish National Space Board (SNSB) supports the RPWS/LP instrument on board Cassini.</Description>
             <Contact>
-                <PersonID>spase://CNES/Person/Mika.Holmberg</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Mika.Holmberg</PersonID>
                 <Role>DataProducer</Role>
             </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Cassini/RPWS/cass-rpws-encelad.xml b/NumericalData/CDPP-AMDA/Cassini/RPWS/cass-rpws-encelad.xml
index f635dcc..eb44589 100644
--- a/NumericalData/CDPP-AMDA/Cassini/RPWS/cass-rpws-encelad.xml
+++ b/NumericalData/CDPP-AMDA/Cassini/RPWS/cass-rpws-encelad.xml
@@ -17,7 +17,7 @@
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/J.Wahlund</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/J.Wahlund</PersonID>
                 <Role>DataProducer</Role>
             </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Cassini/RPWS/cass-rpws-neproxy.xml b/NumericalData/CDPP-AMDA/Cassini/RPWS/cass-rpws-neproxy.xml
index 213d99f..2bf0941 100644
--- a/NumericalData/CDPP-AMDA/Cassini/RPWS/cass-rpws-neproxy.xml
+++ b/NumericalData/CDPP-AMDA/Cassini/RPWS/cass-rpws-neproxy.xml
@@ -19,7 +19,7 @@
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/J.Wahlund</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/J.Wahlund</PersonID>
                 <Role>DataProducer</Role>
             </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Cassini/RPWS/cass-rpws-qtn.xml b/NumericalData/CDPP-AMDA/Cassini/RPWS/cass-rpws-qtn.xml
index beb9d95..3ede3e9 100644
--- a/NumericalData/CDPP-AMDA/Cassini/RPWS/cass-rpws-qtn.xml
+++ b/NumericalData/CDPP-AMDA/Cassini/RPWS/cass-rpws-qtn.xml
@@ -17,7 +17,7 @@
             * measurement uncertainty core electron temperature
             * quality flag that were acquired by QTN analysis on RPWS/HFR Spectra</Description>
             <Contact>
-                <PersonID>spase://CNES/Person/M.Moncuquet</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/M.Moncuquet</PersonID>
                 <Role>DataProducer</Role>
             </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Cassini/RPWS/cass-rpws-saturn.xml b/NumericalData/CDPP-AMDA/Cassini/RPWS/cass-rpws-saturn.xml
index 43fa368..dd6de8a 100644
--- a/NumericalData/CDPP-AMDA/Cassini/RPWS/cass-rpws-saturn.xml
+++ b/NumericalData/CDPP-AMDA/Cassini/RPWS/cass-rpws-saturn.xml
@@ -17,7 +17,7 @@
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/J.Wahlund</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/J.Wahlund</PersonID>
                 <Role>DataProducer</Role>
             </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Cassini/RPWS/cass-rpws-skr.xml b/NumericalData/CDPP-AMDA/Cassini/RPWS/cass-rpws-skr.xml
index 8e44c6d..4902d43 100644
--- a/NumericalData/CDPP-AMDA/Cassini/RPWS/cass-rpws-skr.xml
+++ b/NumericalData/CDPP-AMDA/Cassini/RPWS/cass-rpws-skr.xml
@@ -9,11 +9,11 @@
             <ReleaseDate>2017-10-19T17:07:00</ReleaseDate>
             <Description>Cassini Saturn kilometric Radiation (SKR) data produced from LESIA/Observatoire de Paris.</Description>
             <Contact>
-                <PersonID>spase://CNES/Person/Laurent.Lamy</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Laurent.Lamy</PersonID>
                 <Role>DataProducer</Role>
             </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/Baptiste.Cecconi</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Baptiste.Cecconi</PersonID>
                 <Role>DataProducer</Role>
             </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Cassini/RPWS/cass-rpws-titan.xml b/NumericalData/CDPP-AMDA/Cassini/RPWS/cass-rpws-titan.xml
index 89492a3..470460c 100644
--- a/NumericalData/CDPP-AMDA/Cassini/RPWS/cass-rpws-titan.xml
+++ b/NumericalData/CDPP-AMDA/Cassini/RPWS/cass-rpws-titan.xml
@@ -17,7 +17,7 @@
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/J.Wahlund</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/J.Wahlund</PersonID>
                 <Role>DataProducer</Role>
             </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Cassini/RPWS/cass-skr-phase.xml b/NumericalData/CDPP-AMDA/Cassini/RPWS/cass-skr-phase.xml
index e684885..bdaf7e9 100644
--- a/NumericalData/CDPP-AMDA/Cassini/RPWS/cass-skr-phase.xml
+++ b/NumericalData/CDPP-AMDA/Cassini/RPWS/cass-skr-phase.xml
@@ -15,7 +15,7 @@
                 * drift: SKR peak phase with respect to an arbitrary period (10.7928h in S and 10.6h in N)
 </Description>
              <Contact>
-                <PersonID>spase://CNES/Person/Laurent.Lamy</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Laurent.Lamy</PersonID>
                 <Role>DataProducer</Role>
             </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Cluster/Cluster1/CIS-CODIF/clust1-cis-prp.xml b/NumericalData/CDPP-AMDA/Cluster/Cluster1/CIS-CODIF/clust1-cis-prp.xml
index 0103a38..1ea8019 100644
--- a/NumericalData/CDPP-AMDA/Cluster/Cluster1/CIS-CODIF/clust1-cis-prp.xml
+++ b/NumericalData/CDPP-AMDA/Cluster/Cluster1/CIS-CODIF/clust1-cis-prp.xml
@@ -11,7 +11,7 @@
 from the CIS COmposition Distribution Analyser experiment on the Cluster C1 spacecraft.</Description>
             <Acknowledgement>Please acknowledge the CIS team and ESA Cluster Science Archive when using this data</Acknowledgement>
             <Contact>
-                <PersonID>spase://CNES/Person/Jannis.Dandouras</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Jannis.Dandouras</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>           
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Cluster/Cluster1/CIS-HIA/clust1-hia-mom.xml b/NumericalData/CDPP-AMDA/Cluster/Cluster1/CIS-HIA/clust1-hia-mom.xml
index 457b2c3..64fe8d8 100644
--- a/NumericalData/CDPP-AMDA/Cluster/Cluster1/CIS-HIA/clust1-hia-mom.xml
+++ b/NumericalData/CDPP-AMDA/Cluster/Cluster1/CIS-HIA/clust1-hia-mom.xml
@@ -17,7 +17,7 @@
             They  include  ion  density,  bulk  velocity  vector  (in  both  GSE  and  GSM  frame),  pressure  tensor,  total  pressure, and temperatures (parallel and perpendicular to the magnetic field, and total temperature</Description>
             <Acknowledgement>Principal Investigator: Dr. Iannis Dandouras</Acknowledgement>
             <Contact>
-                <PersonID>spase://CNES/Person/Jannis.Dandouras</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Jannis.Dandouras</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>      
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Cluster/Cluster1/CIS-HIA/clust1-hia-pad.xml b/NumericalData/CDPP-AMDA/Cluster/Cluster1/CIS-HIA/clust1-hia-pad.xml
index e5d1e78..444aaae 100644
--- a/NumericalData/CDPP-AMDA/Cluster/Cluster1/CIS-HIA/clust1-hia-pad.xml
+++ b/NumericalData/CDPP-AMDA/Cluster/Cluster1/CIS-HIA/clust1-hia-pad.xml
@@ -11,7 +11,7 @@
             PADs are calculated for HIA magnetospheric modes. The  dataset  is  provided  with  31  energy  bins  resolution</Description>
             <Acknowledgement>Principal Investigator: Dr. Iannis Dandouras</Acknowledgement>
             <Contact>
-                <PersonID>spase://CNES/Person/Jannis.Dandouras</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Jannis.Dandouras</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Cluster/Cluster1/EFW/clust1-efw-gse.xml b/NumericalData/CDPP-AMDA/Cluster/Cluster1/EFW/clust1-efw-gse.xml
index 99903a5..6d83a55 100644
--- a/NumericalData/CDPP-AMDA/Cluster/Cluster1/EFW/clust1-efw-gse.xml
+++ b/NumericalData/CDPP-AMDA/Cluster/Cluster1/EFW/clust1-efw-gse.xml
@@ -24,7 +24,7 @@
             </Description>
             <Acknowledgement>PrincipalInvestigator: Prof. Mats Andre</Acknowledgement>
             <Contact>
-                <PersonID>spase://CNES/Person/Mats.Andre</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Mats.Andre</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Cluster/Cluster1/EFW/clust1-efw-ppp.xml b/NumericalData/CDPP-AMDA/Cluster/Cluster1/EFW/clust1-efw-ppp.xml
index 3655481..1f668e7 100644
--- a/NumericalData/CDPP-AMDA/Cluster/Cluster1/EFW/clust1-efw-ppp.xml
+++ b/NumericalData/CDPP-AMDA/Cluster/Cluster1/EFW/clust1-efw-ppp.xml
@@ -13,7 +13,7 @@
             </Description> 
             <Acknowledgement>PrincipalInvestigator: Prof. Mats Andre</Acknowledgement>
             <Contact>
-                <PersonID>spase://CNES/Person/Mats.Andre</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Mats.Andre</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>           
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Cluster/Cluster1/EFW/clust1-efw-sr2.xml b/NumericalData/CDPP-AMDA/Cluster/Cluster1/EFW/clust1-efw-sr2.xml
index 2590c82..c0fef90 100644
--- a/NumericalData/CDPP-AMDA/Cluster/Cluster1/EFW/clust1-efw-sr2.xml
+++ b/NumericalData/CDPP-AMDA/Cluster/Cluster1/EFW/clust1-efw-sr2.xml
@@ -21,7 +21,7 @@
             </Description>
             <Acknowledgement>PrincipalInvestigator: Prof. Mats Andre</Acknowledgement>
             <Contact>
-                <PersonID>spase://CNES/Person/Mats.Andre</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Mats.Andre</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Cluster/Cluster1/EFW/clust1-pot-full.xml b/NumericalData/CDPP-AMDA/Cluster/Cluster1/EFW/clust1-pot-full.xml
index ea98971..1ca4bda 100644
--- a/NumericalData/CDPP-AMDA/Cluster/Cluster1/EFW/clust1-pot-full.xml
+++ b/NumericalData/CDPP-AMDA/Cluster/Cluster1/EFW/clust1-pot-full.xml
@@ -20,7 +20,7 @@
                 individual probe potentials are available in the ancillary data</Description>
             <Acknowledgement>PrincipalInvestigator: Prof. Mats Andre</Acknowledgement>
             <Contact>
-                <PersonID>spase://CNES/Person/Mats.Andre</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Mats.Andre</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact> 
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Cluster/Cluster1/EFW/clust1-pot-spin.xml b/NumericalData/CDPP-AMDA/Cluster/Cluster1/EFW/clust1-pot-spin.xml
index 4632312..a54e03f 100644
--- a/NumericalData/CDPP-AMDA/Cluster/Cluster1/EFW/clust1-pot-spin.xml
+++ b/NumericalData/CDPP-AMDA/Cluster/Cluster1/EFW/clust1-pot-spin.xml
@@ -21,7 +21,7 @@
             individual probe potentials are available in the ancillary data</Description>
             <Acknowledgement>PrincipalInvestigator: Prof. Mats Andre</Acknowledgement>
             <Contact>
-                <PersonID>spase://CNES/Person/Mats.Andre</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Mats.Andre</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Cluster/Cluster1/Ephemeris/clust1-orb-all.xml b/NumericalData/CDPP-AMDA/Cluster/Cluster1/Ephemeris/clust1-orb-all.xml
index 663a606..d9e37d8 100644
--- a/NumericalData/CDPP-AMDA/Cluster/Cluster1/Ephemeris/clust1-orb-all.xml
+++ b/NumericalData/CDPP-AMDA/Cluster/Cluster1/Ephemeris/clust1-orb-all.xml
@@ -8,7 +8,7 @@
             <ReleaseDate>2017-01-16T11:50:00</ReleaseDate>
             <Description>Cluster-1 position</Description>         
             <Contact>
-                <PersonID>spase://CNES/Person/Elena.Budnik</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Elena.Budnik</PersonID>
                 <Role>TechnicalContact</Role>
             </Contact>
         </ResourceHeader>
diff --git a/NumericalData/CDPP-AMDA/Cluster/Cluster1/Models/c1-msph-models.xml b/NumericalData/CDPP-AMDA/Cluster/Cluster1/Models/c1-msph-models.xml
index a0d8336..abbab23 100644
--- a/NumericalData/CDPP-AMDA/Cluster/Cluster1/Models/c1-msph-models.xml
+++ b/NumericalData/CDPP-AMDA/Cluster/Cluster1/Models/c1-msph-models.xml
@@ -13,7 +13,7 @@
          </Description>
          <Acknowledgement>TBD</Acknowledgement> 
          <Contact>
-            <PersonID>spase://CNES/Person/Christian.Jacquey</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Christian.Jacquey</PersonID>
             <Role>TechnicalContact</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Cluster/Cluster1/Models/c1-t96-model.xml b/NumericalData/CDPP-AMDA/Cluster/Cluster1/Models/c1-t96-model.xml
index 58e0453..0e7c8a9 100644
--- a/NumericalData/CDPP-AMDA/Cluster/Cluster1/Models/c1-t96-model.xml
+++ b/NumericalData/CDPP-AMDA/Cluster/Cluster1/Models/c1-t96-model.xml
@@ -16,7 +16,7 @@
          </Description>
          <Acknowledgement>TBD</Acknowledgement> 
          <Contact>
-         <PersonID>spase://CNES/Person/Nikolai.Tsyganenko</PersonID>
+         <PersonID>spase://CNES/Person/CDPP-AMDA/Nikolai.Tsyganenko</PersonID>
             <Role>PrincipalInvestigator</Role>
          </Contact>            
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Cluster/Cluster1/WHISPER/clust1-whi-pp.xml b/NumericalData/CDPP-AMDA/Cluster/Cluster1/WHISPER/clust1-whi-pp.xml
index 28e13c4..bec0a5d 100644
--- a/NumericalData/CDPP-AMDA/Cluster/Cluster1/WHISPER/clust1-whi-pp.xml
+++ b/NumericalData/CDPP-AMDA/Cluster/Cluster1/WHISPER/clust1-whi-pp.xml
@@ -15,7 +15,7 @@ b) the limited dynamical range of the instrument leads to an underestimation of 
                 </Description>
              <Acknowledgement>Principal Investigator: Jean Louis Rauch</Acknowledgement>
             <Contact>
-                <PersonID>spase://CNES/Person/Jean-Louis.Rauch</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Jean-Louis.Rauch</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
              <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Cluster/Cluster1/WHISPER/clust1-whi-whi.xml b/NumericalData/CDPP-AMDA/Cluster/Cluster1/WHISPER/clust1-whi-whi.xml
index d504ca8..2fd7df8 100644
--- a/NumericalData/CDPP-AMDA/Cluster/Cluster1/WHISPER/clust1-whi-whi.xml
+++ b/NumericalData/CDPP-AMDA/Cluster/Cluster1/WHISPER/clust1-whi-whi.xml
@@ -19,7 +19,7 @@ extraction process (manually or by the software).
           </Description>
              <Acknowledgement>Principal Investigator: Jean Louis Rauch</Acknowledgement>
             <Contact>
-                <PersonID>spase://CNES/Person/Jean-Louis.Rauch</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Jean-Louis.Rauch</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Cluster/Cluster2/EFW/clust2-efw-gse.xml b/NumericalData/CDPP-AMDA/Cluster/Cluster2/EFW/clust2-efw-gse.xml
index a851567..a9e897f 100644
--- a/NumericalData/CDPP-AMDA/Cluster/Cluster2/EFW/clust2-efw-gse.xml
+++ b/NumericalData/CDPP-AMDA/Cluster/Cluster2/EFW/clust2-efw-gse.xml
@@ -25,7 +25,7 @@
             </Description>
             <Acknowledgement>PrincipalInvestigator: Prof. Mats Andre</Acknowledgement>
             <Contact>
-                <PersonID>spase://CNES/Person/Mats.Andre</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Mats.Andre</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Cluster/Cluster2/EFW/clust2-efw-ppp.xml b/NumericalData/CDPP-AMDA/Cluster/Cluster2/EFW/clust2-efw-ppp.xml
index afdd954..831e935 100644
--- a/NumericalData/CDPP-AMDA/Cluster/Cluster2/EFW/clust2-efw-ppp.xml
+++ b/NumericalData/CDPP-AMDA/Cluster/Cluster2/EFW/clust2-efw-ppp.xml
@@ -13,7 +13,7 @@
             </Description> 
             <Acknowledgement>PrincipalInvestigator: Prof. Mats Andre</Acknowledgement>
             <Contact>
-                <PersonID>spase://CNES/Person/Mats.Andre</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Mats.Andre</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>           
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Cluster/Cluster2/EFW/clust2-efw-sr2.xml b/NumericalData/CDPP-AMDA/Cluster/Cluster2/EFW/clust2-efw-sr2.xml
index df74713..2e93b94 100644
--- a/NumericalData/CDPP-AMDA/Cluster/Cluster2/EFW/clust2-efw-sr2.xml
+++ b/NumericalData/CDPP-AMDA/Cluster/Cluster2/EFW/clust2-efw-sr2.xml
@@ -21,7 +21,7 @@
             </Description>
             <Acknowledgement>PrincipalInvestigator: Prof. Mats Andre</Acknowledgement>
             <Contact>
-                <PersonID>spase://CNES/Person/Mats.Andre</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Mats.Andre</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Cluster/Cluster2/EFW/clust2-pot-full.xml b/NumericalData/CDPP-AMDA/Cluster/Cluster2/EFW/clust2-pot-full.xml
index 3dac295..7423826 100644
--- a/NumericalData/CDPP-AMDA/Cluster/Cluster2/EFW/clust2-pot-full.xml
+++ b/NumericalData/CDPP-AMDA/Cluster/Cluster2/EFW/clust2-pot-full.xml
@@ -20,7 +20,7 @@
                 individual probe potentials are available in the ancillary data</Description>
             <Acknowledgement>PrincipalInvestigator: Prof. Mats Andre</Acknowledgement>
             <Contact>
-                <PersonID>spase://CNES/Person/Mats.Andre</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Mats.Andre</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact> 
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Cluster/Cluster2/EFW/clust2-pot-spin.xml b/NumericalData/CDPP-AMDA/Cluster/Cluster2/EFW/clust2-pot-spin.xml
index 9a90094..b95211d 100644
--- a/NumericalData/CDPP-AMDA/Cluster/Cluster2/EFW/clust2-pot-spin.xml
+++ b/NumericalData/CDPP-AMDA/Cluster/Cluster2/EFW/clust2-pot-spin.xml
@@ -21,7 +21,7 @@
             individual probe potentials are available in the ancillary data</Description>
             <Acknowledgement>PrincipalInvestigator: Prof. Mats Andre</Acknowledgement>
             <Contact>
-                <PersonID>spase://CNES/Person/Mats.Andre</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Mats.Andre</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Cluster/Cluster2/Ephemeris/clust2-orb-all.xml b/NumericalData/CDPP-AMDA/Cluster/Cluster2/Ephemeris/clust2-orb-all.xml
index 3749127..adf3f59 100644
--- a/NumericalData/CDPP-AMDA/Cluster/Cluster2/Ephemeris/clust2-orb-all.xml
+++ b/NumericalData/CDPP-AMDA/Cluster/Cluster2/Ephemeris/clust2-orb-all.xml
@@ -8,7 +8,7 @@
             <ReleaseDate>2017-01-19T12:00:00</ReleaseDate>
             <Description>Cluster-2 position</Description>         
             <Contact>
-                <PersonID>spase://CNES/Person/Elena.Budnik</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Elena.Budnik</PersonID>
                 <Role>TechnicalContact</Role>
             </Contact>
         </ResourceHeader>
diff --git a/NumericalData/CDPP-AMDA/Cluster/Cluster2/Models/c2-msph-models.xml b/NumericalData/CDPP-AMDA/Cluster/Cluster2/Models/c2-msph-models.xml
index 446c95d..7c887ce 100644
--- a/NumericalData/CDPP-AMDA/Cluster/Cluster2/Models/c2-msph-models.xml
+++ b/NumericalData/CDPP-AMDA/Cluster/Cluster2/Models/c2-msph-models.xml
@@ -12,7 +12,7 @@
          </Description>
          <Acknowledgement>TBD</Acknowledgement> 
          <Contact>
-            <PersonID>spase://CNES/Person/Christian.Jacquey</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Christian.Jacquey</PersonID>
             <Role>TechnicalContact</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Cluster/Cluster2/Models/c2-t96-model.xml b/NumericalData/CDPP-AMDA/Cluster/Cluster2/Models/c2-t96-model.xml
index 8e5b26b..57aec62 100644
--- a/NumericalData/CDPP-AMDA/Cluster/Cluster2/Models/c2-t96-model.xml
+++ b/NumericalData/CDPP-AMDA/Cluster/Cluster2/Models/c2-t96-model.xml
@@ -15,7 +15,7 @@
          </Description>
          <Acknowledgement>TBD</Acknowledgement> 
          <Contact>
-         <PersonID>spase://CNES/Person/Nikolai.Tsyganenko</PersonID>
+         <PersonID>spase://CNES/Person/CDPP-AMDA/Nikolai.Tsyganenko</PersonID>
             <Role>PrincipalInvestigator</Role>
          </Contact>            
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Cluster/Cluster2/WHISPER/clust2-whi-pp.xml b/NumericalData/CDPP-AMDA/Cluster/Cluster2/WHISPER/clust2-whi-pp.xml
index 450ff99..8852ee2 100644
--- a/NumericalData/CDPP-AMDA/Cluster/Cluster2/WHISPER/clust2-whi-pp.xml
+++ b/NumericalData/CDPP-AMDA/Cluster/Cluster2/WHISPER/clust2-whi-pp.xml
@@ -15,7 +15,7 @@ b) the limited dynamical range of the instrument leads to an underestimation of 
                 </Description>
              <Acknowledgement>Principal Investigator: Jean Louis Rauch</Acknowledgement>
             <Contact>
-                <PersonID>spase://CNES/Person/Jean-Louis.Rauch</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Jean-Louis.Rauch</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
              <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Cluster/Cluster2/WHISPER/clust2-whi-whi.xml b/NumericalData/CDPP-AMDA/Cluster/Cluster2/WHISPER/clust2-whi-whi.xml
index 70fa65c..08d967a 100644
--- a/NumericalData/CDPP-AMDA/Cluster/Cluster2/WHISPER/clust2-whi-whi.xml
+++ b/NumericalData/CDPP-AMDA/Cluster/Cluster2/WHISPER/clust2-whi-whi.xml
@@ -19,7 +19,7 @@ extraction process (manually or by the software).
           </Description>
              <Acknowledgement>Principal Investigator: Jean Louis Rauch</Acknowledgement>
             <Contact>
-                <PersonID>spase://CNES/Person/Jean-Louis.Rauch</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Jean-Louis.Rauch</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Cluster/Cluster3/CIS-CODIF/clust3-cis-prp.xml b/NumericalData/CDPP-AMDA/Cluster/Cluster3/CIS-CODIF/clust3-cis-prp.xml
index ee26ed0..b88684f 100644
--- a/NumericalData/CDPP-AMDA/Cluster/Cluster3/CIS-CODIF/clust3-cis-prp.xml
+++ b/NumericalData/CDPP-AMDA/Cluster/Cluster3/CIS-CODIF/clust3-cis-prp.xml
@@ -11,7 +11,7 @@
 from the CIS COmposition Distribution Analyser experiment on the Cluster C3 spacecraft.</Description>
             <Acknowledgement>Please acknowledge the CIS team and ESA Cluster Science Archive when using this data</Acknowledgement>
              <Contact>
-                <PersonID>spase://CNES/Person/Jannis.Dandouras</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Jannis.Dandouras</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Cluster/Cluster3/CIS-HIA/clust3-hia-mom.xml b/NumericalData/CDPP-AMDA/Cluster/Cluster3/CIS-HIA/clust3-hia-mom.xml
index 5f91bf8..0d0a08b 100644
--- a/NumericalData/CDPP-AMDA/Cluster/Cluster3/CIS-HIA/clust3-hia-mom.xml
+++ b/NumericalData/CDPP-AMDA/Cluster/Cluster3/CIS-HIA/clust3-hia-mom.xml
@@ -17,7 +17,7 @@
             They  include  ion  density,  bulk  velocity  vector  (in  both  GSE  and  GSM  frame),  pressure  tensor,  total  pressure, and temperatures (parallel and perpendicular to the magnetic field, and total temperature</Description>
             <Acknowledgement>Principal Investigator: Dr. Iannis Dandouras</Acknowledgement>
             <Contact>
-                <PersonID>spase://CNES/Person/Jannis.Dandouras</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Jannis.Dandouras</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>      
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Cluster/Cluster3/CIS-HIA/clust3-hia-pad.xml b/NumericalData/CDPP-AMDA/Cluster/Cluster3/CIS-HIA/clust3-hia-pad.xml
index cd65439..d702313 100644
--- a/NumericalData/CDPP-AMDA/Cluster/Cluster3/CIS-HIA/clust3-hia-pad.xml
+++ b/NumericalData/CDPP-AMDA/Cluster/Cluster3/CIS-HIA/clust3-hia-pad.xml
@@ -11,7 +11,7 @@
             PADs are calculated for HIA magnetospheric modes. The  dataset  is  provided  with  31  energy  bins  resolution</Description>
             <Acknowledgement>Principal Investigator: Dr. Iannis Dandouras</Acknowledgement>
             <Contact>
-                <PersonID>spase://CNES/Person/Jannis.Dandouras</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Jannis.Dandouras</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Cluster/Cluster3/EFW/clust3-efw-gse.xml b/NumericalData/CDPP-AMDA/Cluster/Cluster3/EFW/clust3-efw-gse.xml
index e51cdf3..707df0d 100644
--- a/NumericalData/CDPP-AMDA/Cluster/Cluster3/EFW/clust3-efw-gse.xml
+++ b/NumericalData/CDPP-AMDA/Cluster/Cluster3/EFW/clust3-efw-gse.xml
@@ -25,7 +25,7 @@
             </Description>
             <Acknowledgement>PrincipalInvestigator: Prof. Mats Andre</Acknowledgement>
             <Contact>
-                <PersonID>spase://CNES/Person/Mats.Andre</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Mats.Andre</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Cluster/Cluster3/EFW/clust3-efw-sr2.xml b/NumericalData/CDPP-AMDA/Cluster/Cluster3/EFW/clust3-efw-sr2.xml
index cc3f145..ad44f18 100644
--- a/NumericalData/CDPP-AMDA/Cluster/Cluster3/EFW/clust3-efw-sr2.xml
+++ b/NumericalData/CDPP-AMDA/Cluster/Cluster3/EFW/clust3-efw-sr2.xml
@@ -28,7 +28,7 @@
             </Description>
             <Acknowledgement>PrincipalInvestigator: Prof. Mats Andre</Acknowledgement>
             <Contact>
-                <PersonID>spase://CNES/Person/Mats.Andre</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Mats.Andre</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Cluster/Cluster3/EFW/clust3-pot-full.xml b/NumericalData/CDPP-AMDA/Cluster/Cluster3/EFW/clust3-pot-full.xml
index 39ced5f..e2e3e66 100644
--- a/NumericalData/CDPP-AMDA/Cluster/Cluster3/EFW/clust3-pot-full.xml
+++ b/NumericalData/CDPP-AMDA/Cluster/Cluster3/EFW/clust3-pot-full.xml
@@ -20,7 +20,7 @@
                 individual probe potentials are available in the ancillary data</Description>
             <Acknowledgement>PrincipalInvestigator: Prof. Mats Andre</Acknowledgement>
             <Contact>
-                <PersonID>spase://CNES/Person/Mats.Andre</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Mats.Andre</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact> 
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Cluster/Cluster3/EFW/clust3-pot-spin.xml b/NumericalData/CDPP-AMDA/Cluster/Cluster3/EFW/clust3-pot-spin.xml
index 9042824..6c49f89 100644
--- a/NumericalData/CDPP-AMDA/Cluster/Cluster3/EFW/clust3-pot-spin.xml
+++ b/NumericalData/CDPP-AMDA/Cluster/Cluster3/EFW/clust3-pot-spin.xml
@@ -21,7 +21,7 @@
             individual probe potentials are available in the ancillary data</Description>
             <Acknowledgement>PrincipalInvestigator: Prof. Mats Andre</Acknowledgement>
             <Contact>
-                <PersonID>spase://CNES/Person/Mats.Andre</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Mats.Andre</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Cluster/Cluster3/Ephemeris/clust3-orb-all.xml b/NumericalData/CDPP-AMDA/Cluster/Cluster3/Ephemeris/clust3-orb-all.xml
index a2b099c..5d2e803 100644
--- a/NumericalData/CDPP-AMDA/Cluster/Cluster3/Ephemeris/clust3-orb-all.xml
+++ b/NumericalData/CDPP-AMDA/Cluster/Cluster3/Ephemeris/clust3-orb-all.xml
@@ -8,7 +8,7 @@
             <ReleaseDate>2017-01-19T15:00:00</ReleaseDate>
             <Description>Cluster-3 position</Description>         
             <Contact>
-                <PersonID>spase://CNES/Person/Elena.Budnik</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Elena.Budnik</PersonID>
                 <Role>TechnicalContact</Role>
             </Contact>
         </ResourceHeader>
diff --git a/NumericalData/CDPP-AMDA/Cluster/Cluster3/Models/c3-msph-models.xml b/NumericalData/CDPP-AMDA/Cluster/Cluster3/Models/c3-msph-models.xml
index 34179ef..23b7642 100644
--- a/NumericalData/CDPP-AMDA/Cluster/Cluster3/Models/c3-msph-models.xml
+++ b/NumericalData/CDPP-AMDA/Cluster/Cluster3/Models/c3-msph-models.xml
@@ -12,7 +12,7 @@
          </Description>
          <Acknowledgement>TBD</Acknowledgement> 
          <Contact>
-            <PersonID>spase://CNES/Person/Christian.Jacquey</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Christian.Jacquey</PersonID>
             <Role>TechnicalContact</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Cluster/Cluster3/Models/c3-t96-model.xml b/NumericalData/CDPP-AMDA/Cluster/Cluster3/Models/c3-t96-model.xml
index 35a4345..4dc7f7d 100644
--- a/NumericalData/CDPP-AMDA/Cluster/Cluster3/Models/c3-t96-model.xml
+++ b/NumericalData/CDPP-AMDA/Cluster/Cluster3/Models/c3-t96-model.xml
@@ -15,7 +15,7 @@
          </Description>
          <Acknowledgement>TBD</Acknowledgement> 
          <Contact>
-         <PersonID>spase://CNES/Person/Nikolai.Tsyganenko</PersonID>
+         <PersonID>spase://CNES/Person/CDPP-AMDA/Nikolai.Tsyganenko</PersonID>
             <Role>PrincipalInvestigator</Role>
          </Contact>            
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Cluster/Cluster3/WHISPER/clust3-whi-pp.xml b/NumericalData/CDPP-AMDA/Cluster/Cluster3/WHISPER/clust3-whi-pp.xml
index f902a61..eae403f 100644
--- a/NumericalData/CDPP-AMDA/Cluster/Cluster3/WHISPER/clust3-whi-pp.xml
+++ b/NumericalData/CDPP-AMDA/Cluster/Cluster3/WHISPER/clust3-whi-pp.xml
@@ -15,7 +15,7 @@ b) the limited dynamical range of the instrument leads to an underestimation of 
                 </Description>
              <Acknowledgement>Principal Investigator: Jean Louis Rauch</Acknowledgement>
             <Contact>
-                <PersonID>spase://CNES/Person/Jean-Louis.Rauch</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Jean-Louis.Rauch</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
              <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Cluster/Cluster3/WHISPER/clust3-whi-whi.xml b/NumericalData/CDPP-AMDA/Cluster/Cluster3/WHISPER/clust3-whi-whi.xml
index d49bb21..d06c0ed 100644
--- a/NumericalData/CDPP-AMDA/Cluster/Cluster3/WHISPER/clust3-whi-whi.xml
+++ b/NumericalData/CDPP-AMDA/Cluster/Cluster3/WHISPER/clust3-whi-whi.xml
@@ -19,7 +19,7 @@ extraction process (manually or by the software).
           </Description>
              <Acknowledgement>Principal Investigator: Jean Louis Rauch</Acknowledgement>
             <Contact>
-                <PersonID>spase://CNES/Person/Jean-Louis.Rauch</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Jean-Louis.Rauch</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Cluster/Cluster4/CIS-CODIF/clust4-cis-prp.xml b/NumericalData/CDPP-AMDA/Cluster/Cluster4/CIS-CODIF/clust4-cis-prp.xml
index e5f66bb..c6303e5 100644
--- a/NumericalData/CDPP-AMDA/Cluster/Cluster4/CIS-CODIF/clust4-cis-prp.xml
+++ b/NumericalData/CDPP-AMDA/Cluster/Cluster4/CIS-CODIF/clust4-cis-prp.xml
@@ -11,7 +11,7 @@
 from the CIS COmposition Distribution Analyser experiment on the Cluster C4 spacecraft.</Description>
             <Acknowledgement>Please acknowledge the CIS team and ESA Cluster Science Archive when using this data</Acknowledgement>
            <Contact>
-                <PersonID>spase://CNES/Person/Jannis.Dandouras</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Jannis.Dandouras</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Cluster/Cluster4/EFW/clust4-efw-gse.xml b/NumericalData/CDPP-AMDA/Cluster/Cluster4/EFW/clust4-efw-gse.xml
index f3a1cee..957ac9a 100644
--- a/NumericalData/CDPP-AMDA/Cluster/Cluster4/EFW/clust4-efw-gse.xml
+++ b/NumericalData/CDPP-AMDA/Cluster/Cluster4/EFW/clust4-efw-gse.xml
@@ -26,7 +26,7 @@
             </Description>
             <Acknowledgement>PrincipalInvestigator: Prof. Mats Andre</Acknowledgement>
             <Contact>
-                <PersonID>spase://CNES/Person/Mats.Andre</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Mats.Andre</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Cluster/Cluster4/EFW/clust4-efw-ppp.xml b/NumericalData/CDPP-AMDA/Cluster/Cluster4/EFW/clust4-efw-ppp.xml
index 64ef07c..da9f81d 100644
--- a/NumericalData/CDPP-AMDA/Cluster/Cluster4/EFW/clust4-efw-ppp.xml
+++ b/NumericalData/CDPP-AMDA/Cluster/Cluster4/EFW/clust4-efw-ppp.xml
@@ -13,7 +13,7 @@
             </Description> 
             <Acknowledgement>PrincipalInvestigator: Prof. Mats Andre</Acknowledgement>
             <Contact>
-                <PersonID>spase://CNES/Person/Mats.Andre</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Mats.Andre</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>           
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Cluster/Cluster4/EFW/clust4-pot-full.xml b/NumericalData/CDPP-AMDA/Cluster/Cluster4/EFW/clust4-pot-full.xml
index 494a128..7c21044 100644
--- a/NumericalData/CDPP-AMDA/Cluster/Cluster4/EFW/clust4-pot-full.xml
+++ b/NumericalData/CDPP-AMDA/Cluster/Cluster4/EFW/clust4-pot-full.xml
@@ -20,7 +20,7 @@
                 individual probe potentials are available in the ancillary data</Description>
             <Acknowledgement>PrincipalInvestigator: Prof. Mats Andre</Acknowledgement>
             <Contact>
-                <PersonID>spase://CNES/Person/Mats.Andre</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Mats.Andre</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact> 
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Cluster/Cluster4/EFW/clust4-pot-spin.xml b/NumericalData/CDPP-AMDA/Cluster/Cluster4/EFW/clust4-pot-spin.xml
index 2ab587e..e7536e2 100644
--- a/NumericalData/CDPP-AMDA/Cluster/Cluster4/EFW/clust4-pot-spin.xml
+++ b/NumericalData/CDPP-AMDA/Cluster/Cluster4/EFW/clust4-pot-spin.xml
@@ -21,7 +21,7 @@
             individual probe potentials are available in the ancillary data</Description>
             <Acknowledgement>PrincipalInvestigator: Prof. Mats Andre</Acknowledgement>
             <Contact>
-                <PersonID>spase://CNES/Person/Mats.Andre</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Mats.Andre</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Cluster/Cluster4/Ephemeris/clust4-orb-all.xml b/NumericalData/CDPP-AMDA/Cluster/Cluster4/Ephemeris/clust4-orb-all.xml
index b217225..e058134 100644
--- a/NumericalData/CDPP-AMDA/Cluster/Cluster4/Ephemeris/clust4-orb-all.xml
+++ b/NumericalData/CDPP-AMDA/Cluster/Cluster4/Ephemeris/clust4-orb-all.xml
@@ -8,7 +8,7 @@
             <ReleaseDate>2017-01-16T16:00:00</ReleaseDate>
             <Description>Cluster-4  position</Description>         
             <Contact>
-                <PersonID>spase://CNES/Person/Elena.Budnik</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Elena.Budnik</PersonID>
                 <Role>TechnicalContact</Role>
             </Contact>
         </ResourceHeader>
diff --git a/NumericalData/CDPP-AMDA/Cluster/Cluster4/Models/c4-msph-models.xml b/NumericalData/CDPP-AMDA/Cluster/Cluster4/Models/c4-msph-models.xml
index 485a1aa..006db56 100644
--- a/NumericalData/CDPP-AMDA/Cluster/Cluster4/Models/c4-msph-models.xml
+++ b/NumericalData/CDPP-AMDA/Cluster/Cluster4/Models/c4-msph-models.xml
@@ -12,7 +12,7 @@
          </Description>
          <Acknowledgement>TBD</Acknowledgement> 
          <Contact>
-            <PersonID>spase://CNES/Person/Christian.Jacquey</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Christian.Jacquey</PersonID>
             <Role>TechnicalContact</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Cluster/Cluster4/Models/c4-t96-model.xml b/NumericalData/CDPP-AMDA/Cluster/Cluster4/Models/c4-t96-model.xml
index 9365e13..af96669 100644
--- a/NumericalData/CDPP-AMDA/Cluster/Cluster4/Models/c4-t96-model.xml
+++ b/NumericalData/CDPP-AMDA/Cluster/Cluster4/Models/c4-t96-model.xml
@@ -15,7 +15,7 @@
          </Description>
          <Acknowledgement>TBD</Acknowledgement> 
          <Contact>
-         <PersonID>spase://CNES/Person/Nikolai.Tsyganenko</PersonID>
+         <PersonID>spase://CNES/Person/CDPP-AMDA/Nikolai.Tsyganenko</PersonID>
             <Role>PrincipalInvestigator</Role>
          </Contact>            
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Cluster/Cluster4/WHISPER/clust4-whi-pp.xml b/NumericalData/CDPP-AMDA/Cluster/Cluster4/WHISPER/clust4-whi-pp.xml
index f381e57..4f6d96d 100644
--- a/NumericalData/CDPP-AMDA/Cluster/Cluster4/WHISPER/clust4-whi-pp.xml
+++ b/NumericalData/CDPP-AMDA/Cluster/Cluster4/WHISPER/clust4-whi-pp.xml
@@ -15,7 +15,7 @@ b) the limited dynamical range of the instrument leads to an underestimation of 
                 </Description>
              <Acknowledgement>Principal Investigator: Jean Louis Rauch</Acknowledgement>
             <Contact>
-                <PersonID>spase://CNES/Person/Jean-Louis.Rauch</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Jean-Louis.Rauch</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
              <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Cluster/Cluster4/WHISPER/clust4-whi-whi.xml b/NumericalData/CDPP-AMDA/Cluster/Cluster4/WHISPER/clust4-whi-whi.xml
index 1410318..30e4a98 100644
--- a/NumericalData/CDPP-AMDA/Cluster/Cluster4/WHISPER/clust4-whi-whi.xml
+++ b/NumericalData/CDPP-AMDA/Cluster/Cluster4/WHISPER/clust4-whi-whi.xml
@@ -19,7 +19,7 @@ extraction process (manually or by the software).
           </Description>
              <Acknowledgement>Principal Investigator: Jean Louis Rauch</Acknowledgement>
             <Contact>
-                <PersonID>spase://CNES/Person/Jean-Louis.Rauch</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Jean-Louis.Rauch</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/DSCOVR/Ephemeris/dsc-orb-all.xml b/NumericalData/CDPP-AMDA/DSCOVR/Ephemeris/dsc-orb-all.xml
index 4394d36..2567865 100644
--- a/NumericalData/CDPP-AMDA/DSCOVR/Ephemeris/dsc-orb-all.xml
+++ b/NumericalData/CDPP-AMDA/DSCOVR/Ephemeris/dsc-orb-all.xml
@@ -11,7 +11,7 @@
                 Earth and 148.5 million km from the Sun</Description>                      
             <Acknowledgement>NOAA Space Weather Prediction Center (2016): Deep Space Climate Observatory (DSCOVR). NOAA National Centers for Environmental Information.</Acknowledgement>
             <Contact>
-                <PersonID>spase://CNES/Person/Doug.Biesecker</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Doug.Biesecker</PersonID>
                 <Role>DataProducer</Role>
             </Contact>
         </ResourceHeader>
diff --git a/NumericalData/CDPP-AMDA/DSCOVR/FC/dsc-fc-1m.xml b/NumericalData/CDPP-AMDA/DSCOVR/FC/dsc-fc-1m.xml
index 0097753..5ff9eb4 100644
--- a/NumericalData/CDPP-AMDA/DSCOVR/FC/dsc-fc-1m.xml
+++ b/NumericalData/CDPP-AMDA/DSCOVR/FC/dsc-fc-1m.xml
@@ -12,12 +12,12 @@
               We use rho=2 here, which corresponds to a ratio of He++ between 4% and 5%.</Description>
          <Acknowledgement>NOAA Space Weather Prediction Center (2016): Deep Space Climate Observatory (DSCOVR). NOAA National Centers for Environmental Information.</Acknowledgement>
           <Contact>            
-               <PersonID>spase://CNES/Person/Justin.Kasper</PersonID>
+               <PersonID>spase://CNES/Person/CDPP-AMDA/Justin.Kasper</PersonID>
              <!--<Role>InstrumentLead</Role>-->
              <Role>PrincipalInvestigator</Role>
           </Contact>
           <Contact>
-                <PersonID>spase://CNES/Person/Doug.Biesecker</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Doug.Biesecker</PersonID>
                 <Role>DataProducer</Role>
           </Contact> 
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/DSCOVR/FC/dsc-fc-3s.xml b/NumericalData/CDPP-AMDA/DSCOVR/FC/dsc-fc-3s.xml
index 8c9ab1f..44dd388 100644
--- a/NumericalData/CDPP-AMDA/DSCOVR/FC/dsc-fc-3s.xml
+++ b/NumericalData/CDPP-AMDA/DSCOVR/FC/dsc-fc-3s.xml
@@ -12,12 +12,12 @@
              We use rho=2 here, which corresponds to a ratio of He++ between 4% and 5%.</Description>
          <Acknowledgement>NOAA Space Weather Prediction Center (2016): Deep Space Climate Observatory (DSCOVR). NOAA National Centers for Environmental Information.</Acknowledgement>          
          <Contact>      
-             <PersonID>spase://CNES/Person/Justin.Kasper</PersonID>
+             <PersonID>spase://CNES/Person/CDPP-AMDA/Justin.Kasper</PersonID>
              <!--<Role>InstrumentLead</Role>-->
              <Role>PrincipalInvestigator</Role>
          </Contact>
            <Contact>
-                <PersonID>spase://CNES/Person/Doug.Biesecker</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Doug.Biesecker</PersonID>
                 <Role>DataProducer</Role>
           </Contact> 
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/DSCOVR/MAG/dsc-mag-1m.xml b/NumericalData/CDPP-AMDA/DSCOVR/MAG/dsc-mag-1m.xml
index 9c65c95..9440015 100644
--- a/NumericalData/CDPP-AMDA/DSCOVR/MAG/dsc-mag-1m.xml
+++ b/NumericalData/CDPP-AMDA/DSCOVR/MAG/dsc-mag-1m.xml
@@ -14,7 +14,7 @@
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/Doug.Biesecker</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Doug.Biesecker</PersonID>
                 <Role>DataProducer</Role>
            </Contact>         
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/DSCOVR/MAG/dsc-mag-1s.xml b/NumericalData/CDPP-AMDA/DSCOVR/MAG/dsc-mag-1s.xml
index c5e6b3a..b6a52b5 100644
--- a/NumericalData/CDPP-AMDA/DSCOVR/MAG/dsc-mag-1s.xml
+++ b/NumericalData/CDPP-AMDA/DSCOVR/MAG/dsc-mag-1s.xml
@@ -14,7 +14,7 @@
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/Doug.Biesecker</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Doug.Biesecker</PersonID>
                 <Role>DataProducer</Role>
            </Contact>       
           <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/DoubleStar1/HIA/dstar1-hia-prp.xml b/NumericalData/CDPP-AMDA/DoubleStar1/HIA/dstar1-hia-prp.xml
index 843c258..6e57eae 100644
--- a/NumericalData/CDPP-AMDA/DoubleStar1/HIA/dstar1-hia-prp.xml
+++ b/NumericalData/CDPP-AMDA/DoubleStar1/HIA/dstar1-hia-prp.xml
@@ -9,7 +9,7 @@
          <Description>The Double Star 1 Hot Ion Analyzer (HIA) prime parameter data set contains various parameters at spin resolution. These parameters include universal time, the instrument status, the ion density, ion bulk velocity, and ion temperature. These parameters are available through Double Star Science Data Centre The Data Ring with restricted access.</Description>
          <Acknowledgement>Prof. Henri Reme, European Space Agency/International</Acknowledgement>
          <Contact>
-            <PersonID>spase://CNES/Person/Jannis.Dandouras</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Jannis.Dandouras</PersonID>
             <Role>PrincipalInvestigator</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Ephemerides/amalthea-orb-all.xml b/NumericalData/CDPP-AMDA/Ephemerides/amalthea-orb-all.xml
index f5019d2..a973383 100644
--- a/NumericalData/CDPP-AMDA/Ephemerides/amalthea-orb-all.xml
+++ b/NumericalData/CDPP-AMDA/Ephemerides/amalthea-orb-all.xml
@@ -16,7 +16,7 @@
             Amalthea's orbit lies near the outer edge of the Amalthea Gossamer Ring, 
             which is composed of the dust ejected from the satellite.</Description>
             <Contact>
-            <PersonID>spase://CNES/Person/NAIF</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/NAIF</PersonID>
                 <Role>PrincipalInvestigator</Role>  
             </Contact>
           <Association>
diff --git a/NumericalData/CDPP-AMDA/Ephemerides/callisto-orb-all.xml b/NumericalData/CDPP-AMDA/Ephemerides/callisto-orb-all.xml
index 744d241..52b5d72 100644
--- a/NumericalData/CDPP-AMDA/Ephemerides/callisto-orb-all.xml
+++ b/NumericalData/CDPP-AMDA/Ephemerides/callisto-orb-all.xml
@@ -26,7 +26,7 @@ is relatively low about 300 times lower than, for example, that at Europa.
 Hence, unlike the other Galilean moons, charged-particle irradiation has had a relatively minor effect on Callisto's surface.
 The radiation level at Callisto's surface is equivalent to a dose of about 0.01 rem (0.1 mSv) per day, which is over ten times higher than Earth's average background radiation.</Description>
             <Contact>
-                 <PersonID>spase://CNES/Person/NAIF</PersonID>
+                 <PersonID>spase://CNES/Person/CDPP-AMDA/NAIF</PersonID>
                 <Role>PrincipalInvestigator</Role>  
             </Contact>
           <Association>
diff --git a/NumericalData/CDPP-AMDA/Ephemerides/dione-orb-all.xml b/NumericalData/CDPP-AMDA/Ephemerides/dione-orb-all.xml
index 5838b59..cdf5535 100644
--- a/NumericalData/CDPP-AMDA/Ephemerides/dione-orb-all.xml
+++ b/NumericalData/CDPP-AMDA/Ephemerides/dione-orb-all.xml
@@ -10,7 +10,7 @@
                 
                 Dione has two co-orbital, or trojan, moons, Helene and Polydeuces. They are located within Dione's Lagrangian points L4 and L5, 60 degrees ahead of and behind Dione respectively.</Description>
             <Contact>
-                 <PersonID>spase://CNES/Person/NAIF</PersonID>
+                 <PersonID>spase://CNES/Person/CDPP-AMDA/NAIF</PersonID>
                 <Role>PrincipalInvestigator</Role>  
             </Contact>
           <Association>
diff --git a/NumericalData/CDPP-AMDA/Ephemerides/earth-orb-all.xml b/NumericalData/CDPP-AMDA/Ephemerides/earth-orb-all.xml
index 6bde2b2..df7661e 100644
--- a/NumericalData/CDPP-AMDA/Ephemerides/earth-orb-all.xml
+++ b/NumericalData/CDPP-AMDA/Ephemerides/earth-orb-all.xml
@@ -14,7 +14,7 @@
   * The solar longitude Ls is the Planet-Sun angle, measured from the Northern Hemisphere spring equinox where Ls=0.
 Ls=90 thus corresponds to northern summer solstice, just as Ls=180 marks the northern autumn equinox and Ls=270 the northern winter solstice.</Description>
              <Contact>
-                 <PersonID>spase://CNES/Person/NAIF</PersonID>
+                 <PersonID>spase://CNES/Person/CDPP-AMDA/NAIF</PersonID>
                 <Role>PrincipalInvestigator</Role>  
             </Contact>
         </ResourceHeader>
diff --git a/NumericalData/CDPP-AMDA/Ephemerides/enceladus-orb-all.xml b/NumericalData/CDPP-AMDA/Ephemerides/enceladus-orb-all.xml
index 738e339..fdcb187 100644
--- a/NumericalData/CDPP-AMDA/Ephemerides/enceladus-orb-all.xml
+++ b/NumericalData/CDPP-AMDA/Ephemerides/enceladus-orb-all.xml
@@ -10,7 +10,7 @@
 
 Like most of Saturn's larger satellites, Enceladus rotates synchronously with its orbital period, keeping one face pointed toward Saturn. Unlike Earth's Moon, Enceladus does not appear to librate more than 1.5° about its spin axis. However, analysis of the shape of Enceladus suggests that at some point it was in a 1:4 forced secondary spin–orbit libration. This libration could have provided Enceladus with an additional heat source.</Description>
             <Contact>
-                 <PersonID>spase://CNES/Person/NAIF</PersonID>
+                 <PersonID>spase://CNES/Person/CDPP-AMDA/NAIF</PersonID>
                 <Role>PrincipalInvestigator</Role>  
             </Contact>
           <Association>
diff --git a/NumericalData/CDPP-AMDA/Ephemerides/europa-orb-all.xml b/NumericalData/CDPP-AMDA/Ephemerides/europa-orb-all.xml
index ac34304..0fe30f3 100644
--- a/NumericalData/CDPP-AMDA/Ephemerides/europa-orb-all.xml
+++ b/NumericalData/CDPP-AMDA/Ephemerides/europa-orb-all.xml
@@ -33,7 +33,7 @@ The ultimate source of this energy is Jupiter's rotation, which is tapped by Io
 through the tides it raises on Jupiter and is transferred to Europa and Ganymede by the 
 orbital resonance.</Description>
             <Contact>
-            <PersonID>spase://CNES/Person/NAIF</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/NAIF</PersonID>
                 <Role>PrincipalInvestigator</Role>  
             </Contact>
           <Association>
diff --git a/NumericalData/CDPP-AMDA/Ephemerides/ganymede-orb-all.xml b/NumericalData/CDPP-AMDA/Ephemerides/ganymede-orb-all.xml
index 7e75a51..a7842ac 100644
--- a/NumericalData/CDPP-AMDA/Ephemerides/ganymede-orb-all.xml
+++ b/NumericalData/CDPP-AMDA/Ephemerides/ganymede-orb-all.xml
@@ -23,7 +23,7 @@ The longitudes of the Io–Europa and Europa–Ganymede conjunctions change with
 making triple conjunctions impossible. Such a complicated resonance is called the Laplace 
 resonance. </Description>
             <Contact>
-                 <PersonID>spase://CNES/Person/NAIF</PersonID>
+                 <PersonID>spase://CNES/Person/CDPP-AMDA/NAIF</PersonID>
                 <Role>PrincipalInvestigator</Role>  
             </Contact>
           <Association>
diff --git a/NumericalData/CDPP-AMDA/Ephemerides/io-orb-all.xml b/NumericalData/CDPP-AMDA/Ephemerides/io-orb-all.xml
index a36693b..1bc7068 100644
--- a/NumericalData/CDPP-AMDA/Ephemerides/io-orb-all.xml
+++ b/NumericalData/CDPP-AMDA/Ephemerides/io-orb-all.xml
@@ -19,7 +19,7 @@ The side of Io that always faces in the direction that Io travels in its orbit i
 the leading hemisphere, whereas the side that always faces in the opposite direction is known 
 as the trailing hemisphere.</Description>
             <Contact>
-                 <PersonID>spase://CNES/Person/NAIF</PersonID>
+                 <PersonID>spase://CNES/Person/CDPP-AMDA/NAIF</PersonID>
                 <Role>PrincipalInvestigator</Role>  
             </Contact>
           <Association>
diff --git a/NumericalData/CDPP-AMDA/Ephemerides/jupiter-orb-all.xml b/NumericalData/CDPP-AMDA/Ephemerides/jupiter-orb-all.xml
index 505b367..a81fc98 100644
--- a/NumericalData/CDPP-AMDA/Ephemerides/jupiter-orb-all.xml
+++ b/NumericalData/CDPP-AMDA/Ephemerides/jupiter-orb-all.xml
@@ -18,7 +18,7 @@
   * The solar longitude Ls is the Planet-Sun angle, measured from the Northern Hemisphere spring equinox where Ls=0.
 Ls=90 thus corresponds to northern summer solstice, just as Ls=180 marks the northern autumn equinox and Ls=270 the northern winter solstice.</Description>
             <Contact>                
-                <PersonID>spase://CNES/Person/NAIF</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/NAIF</PersonID>
                 <Role>PrincipalInvestigator</Role>           
             </Contact>
         </ResourceHeader>
diff --git a/NumericalData/CDPP-AMDA/Ephemerides/mars-moons-orb.xml b/NumericalData/CDPP-AMDA/Ephemerides/mars-moons-orb.xml
index 32093ec..ab2180c 100644
--- a/NumericalData/CDPP-AMDA/Ephemerides/mars-moons-orb.xml
+++ b/NumericalData/CDPP-AMDA/Ephemerides/mars-moons-orb.xml
@@ -8,7 +8,7 @@
             <ReleaseDate>2015-10-14T11:46:29Z</ReleaseDate>
             <Description/>
             <Contact>                
-                <PersonID>spase://CNES/Person/NAIF</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/NAIF</PersonID>
                 <Role>PrincipalInvestigator</Role>           
             </Contact>
         </ResourceHeader>
diff --git a/NumericalData/CDPP-AMDA/Ephemerides/mars-orb-all.xml b/NumericalData/CDPP-AMDA/Ephemerides/mars-orb-all.xml
index 68650fa..9ba23ce 100644
--- a/NumericalData/CDPP-AMDA/Ephemerides/mars-orb-all.xml
+++ b/NumericalData/CDPP-AMDA/Ephemerides/mars-orb-all.xml
@@ -18,7 +18,7 @@
   * The solar longitude Ls is the Planet-Sun angle, measured from the Northern Hemisphere spring equinox where Ls=0.
 Ls=90 thus corresponds to northern summer solstice, just as Ls=180 marks the northern autumn equinox and Ls=270 the northern winter solstice.</Description>
             <Contact>
-                <PersonID>spase://CNES/Person/NAIF</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/NAIF</PersonID>
                 <Role>PrincipalInvestigator</Role>  
             </Contact>
         </ResourceHeader>
diff --git a/NumericalData/CDPP-AMDA/Ephemerides/mercury-orb-all.xml b/NumericalData/CDPP-AMDA/Ephemerides/mercury-orb-all.xml
index a7f2383..f9cd7c1 100644
--- a/NumericalData/CDPP-AMDA/Ephemerides/mercury-orb-all.xml
+++ b/NumericalData/CDPP-AMDA/Ephemerides/mercury-orb-all.xml
@@ -18,7 +18,7 @@
   * The solar longitude Ls is the Planet-Sun angle, measured from the Northern Hemisphere spring equinox where Ls=0.
 Ls=90 thus corresponds to northern summer solstice, just as Ls=180 marks the northern autumn equinox and Ls=270 the northern winter solstice.</Description>
             <Contact>
-                <PersonID>spase://CNES/Person/NAIF</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/NAIF</PersonID>
                 <Role>PrincipalInvestigator</Role>                
             </Contact>
         </ResourceHeader>
diff --git a/NumericalData/CDPP-AMDA/Ephemerides/mimas-orb-all.xml b/NumericalData/CDPP-AMDA/Ephemerides/mimas-orb-all.xml
index e42b145..2b9d0b9 100644
--- a/NumericalData/CDPP-AMDA/Ephemerides/mimas-orb-all.xml
+++ b/NumericalData/CDPP-AMDA/Ephemerides/mimas-orb-all.xml
@@ -10,7 +10,7 @@
 
 Mimas is also in a 2:1 mean-motion resonance with the larger moon Tethys, and in a 2:3 resonance with the outer F Ring shepherd moonlet, Pandora.</Description>
             <Contact>
-                 <PersonID>spase://CNES/Person/NAIF</PersonID>
+                 <PersonID>spase://CNES/Person/CDPP-AMDA/NAIF</PersonID>
                 <Role>PrincipalInvestigator</Role>  
             </Contact>
           <Association>
diff --git a/NumericalData/CDPP-AMDA/Ephemerides/moon-earth-all.xml b/NumericalData/CDPP-AMDA/Ephemerides/moon-earth-all.xml
index 84ec329..cc3cc46 100644
--- a/NumericalData/CDPP-AMDA/Ephemerides/moon-earth-all.xml
+++ b/NumericalData/CDPP-AMDA/Ephemerides/moon-earth-all.xml
@@ -8,7 +8,7 @@
             <ReleaseDate>2015-10-14T11:46:29Z</ReleaseDate>
             <Description/>
              <Contact>
-                 <PersonID>spase://CNES/Person/NAIF</PersonID>
+                 <PersonID>spase://CNES/Person/CDPP-AMDA/NAIF</PersonID>
                 <Role>PrincipalInvestigator</Role>  
             </Contact>
         </ResourceHeader>
diff --git a/NumericalData/CDPP-AMDA/Ephemerides/neptune-orb-all.xml b/NumericalData/CDPP-AMDA/Ephemerides/neptune-orb-all.xml
index a396eb2..6cc3e87 100644
--- a/NumericalData/CDPP-AMDA/Ephemerides/neptune-orb-all.xml
+++ b/NumericalData/CDPP-AMDA/Ephemerides/neptune-orb-all.xml
@@ -18,7 +18,7 @@
   * The solar longitude Ls is the Planet-Sun angle, measured from the Northern Hemisphere spring equinox where Ls=0.
 Ls=90 thus corresponds to northern summer solstice, just as Ls=180 marks the northern autumn equinox and Ls=270 the northern winter solstice.</Description>
             <Contact>
-                <PersonID>spase://CNES/Person/NAIF</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/NAIF</PersonID>
                 <Role>PrincipalInvestigator</Role>   
             </Contact>
         </ResourceHeader>
diff --git a/NumericalData/CDPP-AMDA/Ephemerides/p67-orb-all.xml b/NumericalData/CDPP-AMDA/Ephemerides/p67-orb-all.xml
index 37aa68c..848e2dd 100644
--- a/NumericalData/CDPP-AMDA/Ephemerides/p67-orb-all.xml
+++ b/NumericalData/CDPP-AMDA/Ephemerides/p67-orb-all.xml
@@ -11,7 +11,7 @@
          <Acknowledgement>            
          </Acknowledgement>
          <Contact>        
-            <PersonID>spase://CNES/Person/NAIF</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/NAIF</PersonID>
             <Role>PrincipalInvestigator</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Ephemerides/pluto-orb-all.xml b/NumericalData/CDPP-AMDA/Ephemerides/pluto-orb-all.xml
index 17db7e1..336a420 100644
--- a/NumericalData/CDPP-AMDA/Ephemerides/pluto-orb-all.xml
+++ b/NumericalData/CDPP-AMDA/Ephemerides/pluto-orb-all.xml
@@ -18,7 +18,7 @@
   * The solar longitude Ls is the Planet-Sun angle, measured from the Northern Hemisphere spring equinox where Ls=0.
 Ls=90 thus corresponds to northern summer solstice, just as Ls=180 marks the northern autumn equinox and Ls=270 the northern winter solstice.</Description>
             <Contact>
-                <PersonID>spase://CNES/Person/NAIF</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/NAIF</PersonID>
                 <Role>PrincipalInvestigator</Role>    
             </Contact>
         </ResourceHeader>
diff --git a/NumericalData/CDPP-AMDA/Ephemerides/rhea-orb-all.xml b/NumericalData/CDPP-AMDA/Ephemerides/rhea-orb-all.xml
index b13de57..7a544ab 100644
--- a/NumericalData/CDPP-AMDA/Ephemerides/rhea-orb-all.xml
+++ b/NumericalData/CDPP-AMDA/Ephemerides/rhea-orb-all.xml
@@ -8,7 +8,7 @@
             <ReleaseDate>2017-10-14T11:46:29Z</ReleaseDate>
             <Description>Rhea is a small, cold, airless body that is very similar to sister moons Dione and Tethys. As with the other two moons, Rhea is tidally locked in phase with its parent -- one side always faces toward Saturn - as it completes its 4.5-Earth-day orbit around the planet.</Description>
             <Contact>
-                 <PersonID>spase://CNES/Person/NAIF</PersonID>
+                 <PersonID>spase://CNES/Person/CDPP-AMDA/NAIF</PersonID>
                 <Role>PrincipalInvestigator</Role>  
             </Contact>
           <Association>
diff --git a/NumericalData/CDPP-AMDA/Ephemerides/saturn-orb-all.xml b/NumericalData/CDPP-AMDA/Ephemerides/saturn-orb-all.xml
index 2ac45bf..f5b5117 100644
--- a/NumericalData/CDPP-AMDA/Ephemerides/saturn-orb-all.xml
+++ b/NumericalData/CDPP-AMDA/Ephemerides/saturn-orb-all.xml
@@ -20,7 +20,7 @@
 Ls=90 thus corresponds to northern summer solstice, just as Ls=180 marks the northern autumn equinox and Ls=270 the northern winter solstice.
             </Description>
             <Contact>
-                 <PersonID>spase://CNES/Person/NAIF</PersonID>
+                 <PersonID>spase://CNES/Person/CDPP-AMDA/NAIF</PersonID>
                 <Role>PrincipalInvestigator</Role>  
             </Contact>
         </ResourceHeader>
diff --git a/NumericalData/CDPP-AMDA/Ephemerides/tethys-orb-all.xml b/NumericalData/CDPP-AMDA/Ephemerides/tethys-orb-all.xml
index 093cd4a..40a6ce4 100644
--- a/NumericalData/CDPP-AMDA/Ephemerides/tethys-orb-all.xml
+++ b/NumericalData/CDPP-AMDA/Ephemerides/tethys-orb-all.xml
@@ -12,7 +12,7 @@ The Tethyan orbit lies deep inside the magnetosphere of Saturn, so the plasma co
 
 Tethys has two co-orbital moons, Telesto and Calypso orbiting near Tethys's trojan points L4 (60° ahead) and L5 (60° behind) respectively.</Description>
             <Contact>
-                 <PersonID>spase://CNES/Person/NAIF</PersonID>
+                 <PersonID>spase://CNES/Person/CDPP-AMDA/NAIF</PersonID>
                 <Role>PrincipalInvestigator</Role>  
             </Contact>
           <Association>
diff --git a/NumericalData/CDPP-AMDA/Ephemerides/titan-orb-all.xml b/NumericalData/CDPP-AMDA/Ephemerides/titan-orb-all.xml
index bf0362b..4d3a61a 100644
--- a/NumericalData/CDPP-AMDA/Ephemerides/titan-orb-all.xml
+++ b/NumericalData/CDPP-AMDA/Ephemerides/titan-orb-all.xml
@@ -10,7 +10,7 @@
 
 The small, irregularly shaped satellite Hyperion is locked in a 3:4 orbital resonance with Titan. A "slow and smooth" evolution of the resonance—in which Hyperion migrated from a chaotic orbit—is considered unlikely, based on models. Hyperion probably formed in a stable orbital island, whereas the massive Titan absorbed or ejected bodies that made close approaches.</Description>
             <Contact>
-                 <PersonID>spase://CNES/Person/NAIF</PersonID>
+                 <PersonID>spase://CNES/Person/CDPP-AMDA/NAIF</PersonID>
                 <Role>PrincipalInvestigator</Role>  
             </Contact>
           <Association>
diff --git a/NumericalData/CDPP-AMDA/Ephemerides/uranus-orb-all.xml b/NumericalData/CDPP-AMDA/Ephemerides/uranus-orb-all.xml
index 66f1e0b..5ebef8a 100644
--- a/NumericalData/CDPP-AMDA/Ephemerides/uranus-orb-all.xml
+++ b/NumericalData/CDPP-AMDA/Ephemerides/uranus-orb-all.xml
@@ -18,7 +18,7 @@
   * The solar longitude Ls is the Planet-Sun angle, measured from the Northern Hemisphere spring equinox where Ls=0.
 Ls=90 thus corresponds to northern summer solstice, just as Ls=180 marks the northern autumn equinox and Ls=270 the northern winter solstice.</Description>
             <Contact>
-                <PersonID>spase://CNES/Person/NAIF</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/NAIF</PersonID>
                 <Role>PrincipalInvestigator</Role> 
             </Contact>
         </ResourceHeader>
diff --git a/NumericalData/CDPP-AMDA/Ephemerides/venus-orb-all.xml b/NumericalData/CDPP-AMDA/Ephemerides/venus-orb-all.xml
index 734d827..27d3b53 100644
--- a/NumericalData/CDPP-AMDA/Ephemerides/venus-orb-all.xml
+++ b/NumericalData/CDPP-AMDA/Ephemerides/venus-orb-all.xml
@@ -18,7 +18,7 @@
   * The solar longitude Ls is the Planet-Sun angle, measured from the Northern Hemisphere spring equinox where Ls=0.
 Ls=90 thus corresponds to northern summer solstice, just as Ls=180 marks the northern autumn equinox and Ls=270 the northern winter solstice.</Description>
             <Contact>
-                <PersonID>spase://CNES/Person/NAIF</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/NAIF</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
         </ResourceHeader>
diff --git a/NumericalData/CDPP-AMDA/FERMI/LAT/fermi-lat-lc.xml b/NumericalData/CDPP-AMDA/FERMI/LAT/fermi-lat-lc.xml
index 9f33271..b3e2e24 100644
--- a/NumericalData/CDPP-AMDA/FERMI/LAT/fermi-lat-lc.xml
+++ b/NumericalData/CDPP-AMDA/FERMI/LAT/fermi-lat-lc.xml
@@ -9,7 +9,7 @@
             <ReleaseDate>2016-04-11T19:14:50Z</ReleaseDate>
             <Description>LAT data between 100 MeV and 10 GeV filtered for solar counts in 1-minute time bins, no energy binning, using light-bucket method</Description>
             <Contact>
-                <PersonID>spase://CNES/Person/I.Plotnikov</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/I.Plotnikov</PersonID>
                 <Role>DataProducer</Role>      
           </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/FREJA/ESP/fja-sc-charg.xml b/NumericalData/CDPP-AMDA/FREJA/ESP/fja-sc-charg.xml
index 4c75176..10b0a17 100644
--- a/NumericalData/CDPP-AMDA/FREJA/ESP/fja-sc-charg.xml
+++ b/NumericalData/CDPP-AMDA/FREJA/ESP/fja-sc-charg.xml
@@ -18,7 +18,7 @@
                 be heavily dependent on instrumental capabilities and measurement mode types.
             </Description>
             <Contact>
-                <PersonID>spase://CNES/Person/J.Wahlund</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/J.Wahlund</PersonID>
                 <Role>ProjectScientist</Role>      
           </Contact>
         </ResourceHeader>
diff --git a/NumericalData/CDPP-AMDA/GEOTAIL/EPIC/gtl-epic-e.xml b/NumericalData/CDPP-AMDA/GEOTAIL/EPIC/gtl-epic-e.xml
index b373fdd..7cb1723 100644
--- a/NumericalData/CDPP-AMDA/GEOTAIL/EPIC/gtl-epic-e.xml
+++ b/NumericalData/CDPP-AMDA/GEOTAIL/EPIC/gtl-epic-e.xml
@@ -13,15 +13,15 @@
            </Description>
          <Acknowledgement/>
           <Contact>
-                <PersonID>spase://CNES/Person/Stuart.Nyland</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Stuart.Nyland</PersonID>
                 <Role>DataProducer</Role>
           </Contact>
          <Contact>
-                <PersonID>spase://CNES/Person/Christian.Jacquey</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Christian.Jacquey</PersonID>
                 <Role>TechnicalContact</Role>
           </Contact>
          <Contact>
-                <PersonID>spase://CNES/Person/Elena.Budnik</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Elena.Budnik</PersonID>
                 <Role>TechnicalContact</Role>
           </Contact>
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/GEOTAIL/EPIC/gtl-epic-ed.xml b/NumericalData/CDPP-AMDA/GEOTAIL/EPIC/gtl-epic-ed.xml
index a80746d..09c52f8 100644
--- a/NumericalData/CDPP-AMDA/GEOTAIL/EPIC/gtl-epic-ed.xml
+++ b/NumericalData/CDPP-AMDA/GEOTAIL/EPIC/gtl-epic-ed.xml
@@ -10,15 +10,15 @@
          <Description>* Sectors (degrees) : 0. - tailward, 45., 90. - dawnward, 135., 180. - sunward, 225., 270. - duskward, 315.; </Description>
          <Acknowledgement/>
          <Contact>
-                <PersonID>spase://CNES/Person/Stuart.Nyland</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Stuart.Nyland</PersonID>
                 <Role>DataProducer</Role>
           </Contact> 
          <Contact>
-                <PersonID>spase://CNES/Person/Christian.Jacquey</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Christian.Jacquey</PersonID>
                 <Role>TechnicalContact</Role>
           </Contact>
          <Contact>
-                <PersonID>spase://CNES/Person/Elena.Budnik</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Elena.Budnik</PersonID>
                 <Role>TechnicalContact</Role>
           </Contact>
       <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/GEOTAIL/EPIC/gtl-epic-ehigh.xml b/NumericalData/CDPP-AMDA/GEOTAIL/EPIC/gtl-epic-ehigh.xml
index 0a223c8..a93226c 100644
--- a/NumericalData/CDPP-AMDA/GEOTAIL/EPIC/gtl-epic-ehigh.xml
+++ b/NumericalData/CDPP-AMDA/GEOTAIL/EPIC/gtl-epic-ehigh.xml
@@ -17,15 +17,15 @@
          </Description>
          <Acknowledgement/>
           <Contact>
-                <PersonID>spase://CNES/Person/Stuart.Nyland</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Stuart.Nyland</PersonID>
                 <Role>DataProducer</Role>
           </Contact>
          <Contact>
-                <PersonID>spase://CNES/Person/Christian.Jacquey</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Christian.Jacquey</PersonID>
                 <Role>TechnicalContact</Role>
           </Contact>
          <Contact>
-                <PersonID>spase://CNES/Person/Elena.Budnik</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Elena.Budnik</PersonID>
                 <Role>TechnicalContact</Role>
           </Contact>
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/GEOTAIL/EPIC/gtl-epic-he.xml b/NumericalData/CDPP-AMDA/GEOTAIL/EPIC/gtl-epic-he.xml
index e2ed8d4..1cc6e1b 100644
--- a/NumericalData/CDPP-AMDA/GEOTAIL/EPIC/gtl-epic-he.xml
+++ b/NumericalData/CDPP-AMDA/GEOTAIL/EPIC/gtl-epic-he.xml
@@ -13,15 +13,15 @@
            </Description>
          <Acknowledgement/>
           <Contact>
-                <PersonID>spase://CNES/Person/Stuart.Nyland</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Stuart.Nyland</PersonID>
                 <Role>DataProducer</Role>
           </Contact>
          <Contact>
-                <PersonID>spase://CNES/Person/Christian.Jacquey</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Christian.Jacquey</PersonID>
                 <Role>TechnicalContact</Role>
           </Contact>
          <Contact>
-                <PersonID>spase://CNES/Person/Elena.Budnik</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Elena.Budnik</PersonID>
                 <Role>TechnicalContact</Role>
           </Contact>
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/GEOTAIL/EPIC/gtl-epic-hehigh.xml b/NumericalData/CDPP-AMDA/GEOTAIL/EPIC/gtl-epic-hehigh.xml
index 24b2503..d2ebb25 100644
--- a/NumericalData/CDPP-AMDA/GEOTAIL/EPIC/gtl-epic-hehigh.xml
+++ b/NumericalData/CDPP-AMDA/GEOTAIL/EPIC/gtl-epic-hehigh.xml
@@ -13,15 +13,15 @@
          </Description>  
          <Acknowledgement/>
           <Contact>
-                <PersonID>spase://CNES/Person/Stuart.Nyland</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Stuart.Nyland</PersonID>
                 <Role>DataProducer</Role>
           </Contact>
          <Contact>
-                <PersonID>spase://CNES/Person/Christian.Jacquey</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Christian.Jacquey</PersonID>
                 <Role>TechnicalContact</Role>
           </Contact>
          <Contact>
-                <PersonID>spase://CNES/Person/Elena.Budnik</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Elena.Budnik</PersonID>
                 <Role>TechnicalContact</Role>
           </Contact>
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/GEOTAIL/EPIC/gtl-epic-hr0.xml b/NumericalData/CDPP-AMDA/GEOTAIL/EPIC/gtl-epic-hr0.xml
index 853cba7..8e861e4 100644
--- a/NumericalData/CDPP-AMDA/GEOTAIL/EPIC/gtl-epic-hr0.xml
+++ b/NumericalData/CDPP-AMDA/GEOTAIL/EPIC/gtl-epic-hr0.xml
@@ -21,15 +21,15 @@
             </Description>
          <Acknowledgement/>
           <Contact>
-                <PersonID>spase://CNES/Person/Stuart.Nyland</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Stuart.Nyland</PersonID>
                 <Role>DataProducer</Role>
           </Contact>
          <Contact>
-                <PersonID>spase://CNES/Person/Christian.Jacquey</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Christian.Jacquey</PersonID>
                 <Role>TechnicalContact</Role>
           </Contact>
          <Contact>
-                <PersonID>spase://CNES/Person/Elena.Budnik</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Elena.Budnik</PersonID>
                 <Role>TechnicalContact</Role>
           </Contact>
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/GEOTAIL/EPIC/gtl-epic-m.xml b/NumericalData/CDPP-AMDA/GEOTAIL/EPIC/gtl-epic-m.xml
index f23aeab..1990e3b 100644
--- a/NumericalData/CDPP-AMDA/GEOTAIL/EPIC/gtl-epic-m.xml
+++ b/NumericalData/CDPP-AMDA/GEOTAIL/EPIC/gtl-epic-m.xml
@@ -13,15 +13,15 @@
           </Description>
          <Acknowledgement/>
           <Contact>
-                <PersonID>spase://CNES/Person/Stuart.Nyland</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Stuart.Nyland</PersonID>
                 <Role>DataProducer</Role>
           </Contact>
          <Contact>
-                <PersonID>spase://CNES/Person/Christian.Jacquey</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Christian.Jacquey</PersonID>
                 <Role>TechnicalContact</Role>
           </Contact>
          <Contact>
-                <PersonID>spase://CNES/Person/Elena.Budnik</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Elena.Budnik</PersonID>
                 <Role>TechnicalContact</Role>
           </Contact>
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/GEOTAIL/EPIC/gtl-epic-mhigh.xml b/NumericalData/CDPP-AMDA/GEOTAIL/EPIC/gtl-epic-mhigh.xml
index 43f01d7..ae5ef49 100644
--- a/NumericalData/CDPP-AMDA/GEOTAIL/EPIC/gtl-epic-mhigh.xml
+++ b/NumericalData/CDPP-AMDA/GEOTAIL/EPIC/gtl-epic-mhigh.xml
@@ -13,15 +13,15 @@
          </Description>
          <Acknowledgement/>
           <Contact>
-                <PersonID>spase://CNES/Person/Stuart.Nyland</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Stuart.Nyland</PersonID>
                 <Role>DataProducer</Role>
           </Contact>
          <Contact>
-                <PersonID>spase://CNES/Person/Christian.Jacquey</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Christian.Jacquey</PersonID>
                 <Role>TechnicalContact</Role>
           </Contact>
          <Contact>
-                <PersonID>spase://CNES/Person/Elena.Budnik</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Elena.Budnik</PersonID>
                 <Role>TechnicalContact</Role>
           </Contact>
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/GEOTAIL/EPIC/gtl-epic-p.xml b/NumericalData/CDPP-AMDA/GEOTAIL/EPIC/gtl-epic-p.xml
index b6f8234..91dbc6f 100644
--- a/NumericalData/CDPP-AMDA/GEOTAIL/EPIC/gtl-epic-p.xml
+++ b/NumericalData/CDPP-AMDA/GEOTAIL/EPIC/gtl-epic-p.xml
@@ -13,15 +13,15 @@
          </Description>
          <Acknowledgement/>
           <Contact>
-                <PersonID>spase://CNES/Person/Stuart.Nyland</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Stuart.Nyland</PersonID>
                 <Role>DataProducer</Role>
           </Contact>
          <Contact>
-                <PersonID>spase://CNES/Person/Christian.Jacquey</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Christian.Jacquey</PersonID>
                 <Role>TechnicalContact</Role>
           </Contact>
          <Contact>
-                <PersonID>spase://CNES/Person/Elena.Budnik</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Elena.Budnik</PersonID>
                 <Role>TechnicalContact</Role>
           </Contact>
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/GEOTAIL/EPIC/gtl-epic-phigh.xml b/NumericalData/CDPP-AMDA/GEOTAIL/EPIC/gtl-epic-phigh.xml
index 9d25b7d..200f10d 100644
--- a/NumericalData/CDPP-AMDA/GEOTAIL/EPIC/gtl-epic-phigh.xml
+++ b/NumericalData/CDPP-AMDA/GEOTAIL/EPIC/gtl-epic-phigh.xml
@@ -13,15 +13,15 @@
          </Description>
          <Acknowledgement/>
           <Contact>
-                <PersonID>spase://CNES/Person/Stuart.Nyland</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Stuart.Nyland</PersonID>
                 <Role>DataProducer</Role>
           </Contact>
          <Contact>
-                <PersonID>spase://CNES/Person/Christian.Jacquey</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Christian.Jacquey</PersonID>
                 <Role>TechnicalContact</Role>
           </Contact>
          <Contact>
-                <PersonID>spase://CNES/Person/Elena.Budnik</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Elena.Budnik</PersonID>
                 <Role>TechnicalContact</Role>
           </Contact>
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/GEOTAIL/Models/gtl-msph-models.xml b/NumericalData/CDPP-AMDA/GEOTAIL/Models/gtl-msph-models.xml
index 966e51d..75d896e 100644
--- a/NumericalData/CDPP-AMDA/GEOTAIL/Models/gtl-msph-models.xml
+++ b/NumericalData/CDPP-AMDA/GEOTAIL/Models/gtl-msph-models.xml
@@ -12,7 +12,7 @@
          </Description>
          <Acknowledgement>TBD</Acknowledgement> 
          <Contact>
-            <PersonID>spase://CNES/Person/Christian.Jacquey</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Christian.Jacquey</PersonID>
             <Role>TechnicalContact</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/GEOTAIL/Models/gtl-t96-model.xml b/NumericalData/CDPP-AMDA/GEOTAIL/Models/gtl-t96-model.xml
index 785bc22..56d37af 100644
--- a/NumericalData/CDPP-AMDA/GEOTAIL/Models/gtl-t96-model.xml
+++ b/NumericalData/CDPP-AMDA/GEOTAIL/Models/gtl-t96-model.xml
@@ -15,7 +15,7 @@
          </Description>
          <Acknowledgement>TBD</Acknowledgement> 
          <Contact>
-         <PersonID>spase://CNES/Person/Nikolai.Tsyganenko</PersonID>
+         <PersonID>spase://CNES/Person/CDPP-AMDA/Nikolai.Tsyganenko</PersonID>
             <Role>PrincipalInvestigator</Role>
          </Contact>            
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Galileo/EPD/gll-epd-amalele.xml b/NumericalData/CDPP-AMDA/Galileo/EPD/gll-epd-amalele.xml
index ca0d0cd..d2848ff 100644
--- a/NumericalData/CDPP-AMDA/Galileo/EPD/gll-epd-amalele.xml
+++ b/NumericalData/CDPP-AMDA/Galileo/EPD/gll-epd-amalele.xml
@@ -33,19 +33,19 @@ discussed in detail in Kollmann et al. [2018, JGR].
                 <Role>PrincipalInvestigator</Role>
             </Contact>
 	    <Contact>
-                <PersonID>spase://CNES/Person/Peter.Kollmann</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Peter.Kollmann</PersonID>
                 <Role>DataProducer</Role>
             </Contact> 
             <Contact>
-                <PersonID>spase://CNES/Person/Quentin.Nenon</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Quentin.Nenon</PersonID>
                 <Role>DataProducer</Role>
             </Contact> 	    
 	    <Contact>
-                <PersonID>spase://CNES/Person/Christopher.Paranicas</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Christopher.Paranicas</PersonID>
                 <Role>CoInvestigator</Role>
             </Contact>
 	    <Contact>
-                <PersonID>spase://CNES/Person/Norbert.Krupp</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Norbert.Krupp</PersonID>
                 <Role>CoInvestigator</Role>
             </Contact>
             <Association>
diff --git a/NumericalData/CDPP-AMDA/Galileo/EPD/gll-epd-amalion.xml b/NumericalData/CDPP-AMDA/Galileo/EPD/gll-epd-amalion.xml
index d5d0247..bc05152 100644
--- a/NumericalData/CDPP-AMDA/Galileo/EPD/gll-epd-amalion.xml
+++ b/NumericalData/CDPP-AMDA/Galileo/EPD/gll-epd-amalion.xml
@@ -29,19 +29,19 @@ detail in Kollmann et al. [2018, JGR].
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/Peter.Kollmann</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Peter.Kollmann</PersonID>
                 <Role>DataProducer</Role>
             </Contact>  
             <Contact>
-                <PersonID>spase://CNES/Person/Quentin.Nenon</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Quentin.Nenon</PersonID>
                 <Role>DataProducer</Role>
             </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/Christopher.Paranicas</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Christopher.Paranicas</PersonID>
                 <Role>CoInvestigator</Role>
             </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/Norbert.Krupp</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Norbert.Krupp</PersonID>
                 <Role>CoInvestigator</Role>
             </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Galileo/EPD/gll-epd-callele.xml b/NumericalData/CDPP-AMDA/Galileo/EPD/gll-epd-callele.xml
index 5a03ba4..997f3be 100644
--- a/NumericalData/CDPP-AMDA/Galileo/EPD/gll-epd-callele.xml
+++ b/NumericalData/CDPP-AMDA/Galileo/EPD/gll-epd-callele.xml
@@ -39,19 +39,19 @@ discussed in detail in Kollmann et al. [2018, JGR].
                 <Role>PrincipalInvestigator</Role>
             </Contact>
 	    <Contact>
-                <PersonID>spase://CNES/Person/Peter.Kollmann</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Peter.Kollmann</PersonID>
                 <Role>DataProducer</Role>
             </Contact>
              <Contact>
-                <PersonID>spase://CNES/Person/Quentin.Nenon</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Quentin.Nenon</PersonID>
                 <Role>DataProducer</Role>
             </Contact> 
 	    <Contact>
-                <PersonID>spase://CNES/Person/Christopher.Paranicas</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Christopher.Paranicas</PersonID>
                 <Role>CoInvestigator</Role>
             </Contact>
 	    <Contact>
-                <PersonID>spase://CNES/Person/Norbert.Krupp</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Norbert.Krupp</PersonID>
                 <Role>CoInvestigator</Role>
             </Contact>
             <Association>
diff --git a/NumericalData/CDPP-AMDA/Galileo/EPD/gll-epd-callion.xml b/NumericalData/CDPP-AMDA/Galileo/EPD/gll-epd-callion.xml
index 3dd05d8..a078c0e 100644
--- a/NumericalData/CDPP-AMDA/Galileo/EPD/gll-epd-callion.xml
+++ b/NumericalData/CDPP-AMDA/Galileo/EPD/gll-epd-callion.xml
@@ -34,19 +34,19 @@ detail in Kollmann et al. [2018, JGR].
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/Peter.Kollmann</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Peter.Kollmann</PersonID>
                 <Role>DataProducer</Role>
             </Contact>  
             <Contact>
-                <PersonID>spase://CNES/Person/Quentin.Nenon</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Quentin.Nenon</PersonID>
                 <Role>DataProducer</Role>
             </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/Christopher.Paranicas</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Christopher.Paranicas</PersonID>
                 <Role>CoInvestigator</Role>
             </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/Norbert.Krupp</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Norbert.Krupp</PersonID>
                 <Role>CoInvestigator</Role>
             </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Galileo/EPD/gll-epd-ert.xml b/NumericalData/CDPP-AMDA/Galileo/EPD/gll-epd-ert.xml
index c27b17d..97716f8 100644
--- a/NumericalData/CDPP-AMDA/Galileo/EPD/gll-epd-ert.xml
+++ b/NumericalData/CDPP-AMDA/Galileo/EPD/gll-epd-ert.xml
@@ -36,19 +36,19 @@
                 <Role>PrincipalInvestigator</Role>
             </Contact>
 	    <Contact>
-                <PersonID>spase://CNES/Person/Peter.Kollmann</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Peter.Kollmann</PersonID>
                 <Role>DataProducer</Role>
             </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/Quentin.Nenon</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Quentin.Nenon</PersonID>
                 <Role>DataProducer</Role>
             </Contact> 
 	    <Contact>
-                <PersonID>spase://CNES/Person/Christopher.Paranicas</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Christopher.Paranicas</PersonID>
                 <Role>CoInvestigator</Role>
             </Contact>
 	    <Contact>
-                <PersonID>spase://CNES/Person/Norbert.Krupp</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Norbert.Krupp</PersonID>
                 <Role>CoInvestigator</Role>
             </Contact>
             <Association>
diff --git a/NumericalData/CDPP-AMDA/Galileo/EPD/gll-epd-euroele.xml b/NumericalData/CDPP-AMDA/Galileo/EPD/gll-epd-euroele.xml
index 4af7f53..6aa2c93 100644
--- a/NumericalData/CDPP-AMDA/Galileo/EPD/gll-epd-euroele.xml
+++ b/NumericalData/CDPP-AMDA/Galileo/EPD/gll-epd-euroele.xml
@@ -43,19 +43,19 @@ discussed in detail in Kollmann et al. [2018, JGR].
                 <Role>PrincipalInvestigator</Role>
             </Contact>
 	    <Contact>
-                <PersonID>spase://CNES/Person/Peter.Kollmann</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Peter.Kollmann</PersonID>
                 <Role>DataProducer</Role>
             </Contact>	
              <Contact>
-                <PersonID>spase://CNES/Person/Quentin.Nenon</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Quentin.Nenon</PersonID>
                 <Role>DataProducer</Role>
             </Contact> 
 	    <Contact>
-                <PersonID>spase://CNES/Person/Christopher.Paranicas</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Christopher.Paranicas</PersonID>
                 <Role>CoInvestigator</Role>
             </Contact>
 	    <Contact>
-                <PersonID>spase://CNES/Person/Norbert.Krupp</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Norbert.Krupp</PersonID>
                 <Role>CoInvestigator</Role>
             </Contact>
             <Association>
diff --git a/NumericalData/CDPP-AMDA/Galileo/EPD/gll-epd-euroion.xml b/NumericalData/CDPP-AMDA/Galileo/EPD/gll-epd-euroion.xml
index f36c856..69e8f31 100644
--- a/NumericalData/CDPP-AMDA/Galileo/EPD/gll-epd-euroion.xml
+++ b/NumericalData/CDPP-AMDA/Galileo/EPD/gll-epd-euroion.xml
@@ -39,19 +39,19 @@ detail in Kollmann et al. [2018, JGR].
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/Peter.Kollmann</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Peter.Kollmann</PersonID>
                 <Role>DataProducer</Role>
             </Contact>  
             <Contact>
-                <PersonID>spase://CNES/Person/Quentin.Nenon</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Quentin.Nenon</PersonID>
                 <Role>DataProducer</Role>
             </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/Christopher.Paranicas</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Christopher.Paranicas</PersonID>
                 <Role>CoInvestigator</Role>
             </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/Norbert.Krupp</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Norbert.Krupp</PersonID>
                 <Role>CoInvestigator</Role>
             </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Galileo/EPD/gll-epd-ganyele.xml b/NumericalData/CDPP-AMDA/Galileo/EPD/gll-epd-ganyele.xml
index 2ec396c..5e00400 100644
--- a/NumericalData/CDPP-AMDA/Galileo/EPD/gll-epd-ganyele.xml
+++ b/NumericalData/CDPP-AMDA/Galileo/EPD/gll-epd-ganyele.xml
@@ -40,19 +40,19 @@ discussed in detail in Kollmann et al. [2018, JGR].
                 <Role>PrincipalInvestigator</Role>
             </Contact>
 	    <Contact>
-                <PersonID>spase://CNES/Person/Peter.Kollmann</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Peter.Kollmann</PersonID>
                 <Role>DataProducer</Role>
             </Contact>
              <Contact>
-                <PersonID>spase://CNES/Person/Quentin.Nenon</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Quentin.Nenon</PersonID>
                 <Role>DataProducer</Role>
             </Contact> 
 	    <Contact>
-                <PersonID>spase://CNES/Person/Christopher.Paranicas</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Christopher.Paranicas</PersonID>
                 <Role>CoInvestigator</Role>
             </Contact>
 	    <Contact>
-                <PersonID>spase://CNES/Person/Norbert.Krupp</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Norbert.Krupp</PersonID>
                 <Role>CoInvestigator</Role>
             </Contact>
             <Association>
diff --git a/NumericalData/CDPP-AMDA/Galileo/EPD/gll-epd-ganyion.xml b/NumericalData/CDPP-AMDA/Galileo/EPD/gll-epd-ganyion.xml
index c246f3d..d5d445f 100644
--- a/NumericalData/CDPP-AMDA/Galileo/EPD/gll-epd-ganyion.xml
+++ b/NumericalData/CDPP-AMDA/Galileo/EPD/gll-epd-ganyion.xml
@@ -36,19 +36,19 @@ detail in Kollmann et al. [2018, JGR].
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/Peter.Kollmann</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Peter.Kollmann</PersonID>
                 <Role>DataProducer</Role>
             </Contact>  
             <Contact>
-                <PersonID>spase://CNES/Person/Quentin.Nenon</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Quentin.Nenon</PersonID>
                 <Role>DataProducer</Role>
             </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/Christopher.Paranicas</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Christopher.Paranicas</PersonID>
                 <Role>CoInvestigator</Role>
             </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/Norbert.Krupp</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Norbert.Krupp</PersonID>
                 <Role>CoInvestigator</Role>
             </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Galileo/EPD/gll-epd-ioele.xml b/NumericalData/CDPP-AMDA/Galileo/EPD/gll-epd-ioele.xml
index 162c0e3..ebef361 100644
--- a/NumericalData/CDPP-AMDA/Galileo/EPD/gll-epd-ioele.xml
+++ b/NumericalData/CDPP-AMDA/Galileo/EPD/gll-epd-ioele.xml
@@ -38,19 +38,19 @@ discussed in detail in Kollmann et al. [2018, JGR].
                 <Role>PrincipalInvestigator</Role>
             </Contact>
 	    <Contact>
-                <PersonID>spase://CNES/Person/Peter.Kollmann</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Peter.Kollmann</PersonID>
                 <Role>DataProducer</Role>
             </Contact>
            <Contact>
-                <PersonID>spase://CNES/Person/Quentin.Nenon</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Quentin.Nenon</PersonID>
                 <Role>DataProducer</Role>
             </Contact>   
 	    <Contact>
-                <PersonID>spase://CNES/Person/Christopher.Paranicas</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Christopher.Paranicas</PersonID>
                 <Role>CoInvestigator</Role>
             </Contact>
 	    <Contact>
-                <PersonID>spase://CNES/Person/Norbert.Krupp</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Norbert.Krupp</PersonID>
                 <Role>CoInvestigator</Role>
             </Contact>
             <Association>
diff --git a/NumericalData/CDPP-AMDA/Galileo/EPD/gll-epd-ioion.xml b/NumericalData/CDPP-AMDA/Galileo/EPD/gll-epd-ioion.xml
index acbc08d..5045bd8 100644
--- a/NumericalData/CDPP-AMDA/Galileo/EPD/gll-epd-ioion.xml
+++ b/NumericalData/CDPP-AMDA/Galileo/EPD/gll-epd-ioion.xml
@@ -34,19 +34,19 @@ detail in Kollmann et al. [2018, JGR].
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/Peter.Kollmann</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Peter.Kollmann</PersonID>
                 <Role>DataProducer</Role>
             </Contact>  
             <Contact>
-                <PersonID>spase://CNES/Person/Quentin.Nenon</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Quentin.Nenon</PersonID>
                 <Role>DataProducer</Role>
             </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/Christopher.Paranicas</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Christopher.Paranicas</PersonID>
                 <Role>CoInvestigator</Role>
             </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/Norbert.Krupp</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Norbert.Krupp</PersonID>
                 <Role>CoInvestigator</Role>
             </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Galileo/EPD/gll-epd-rt.xml b/NumericalData/CDPP-AMDA/Galileo/EPD/gll-epd-rt.xml
index 1f77624..6e28a2a 100644
--- a/NumericalData/CDPP-AMDA/Galileo/EPD/gll-epd-rt.xml
+++ b/NumericalData/CDPP-AMDA/Galileo/EPD/gll-epd-rt.xml
@@ -37,19 +37,19 @@
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/Peter.Kollmann</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Peter.Kollmann</PersonID>
                 <Role>DataProducer</Role>
             </Contact>  
             <Contact>
-                <PersonID>spase://CNES/Person/Quentin.Nenon</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Quentin.Nenon</PersonID>
                 <Role>DataProducer</Role>
             </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/Christopher.Paranicas</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Christopher.Paranicas</PersonID>
                 <Role>CoInvestigator</Role>
             </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/Norbert.Krupp</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Norbert.Krupp</PersonID>
                 <Role>CoInvestigator</Role>
             </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Galileo/EPD/gll-epd-survele.xml b/NumericalData/CDPP-AMDA/Galileo/EPD/gll-epd-survele.xml
index c79b40b..e4e44d9 100644
--- a/NumericalData/CDPP-AMDA/Galileo/EPD/gll-epd-survele.xml
+++ b/NumericalData/CDPP-AMDA/Galileo/EPD/gll-epd-survele.xml
@@ -48,19 +48,19 @@ discussed in detail in Kollmann et al. [2018, JGR].
                 <Role>PrincipalInvestigator</Role>
             </Contact>
 	    <Contact>
-                <PersonID>spase://CNES/Person/Peter.Kollmann</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Peter.Kollmann</PersonID>
                 <Role>DataProducer</Role>
             </Contact>	
            <Contact>
-                <PersonID>spase://CNES/Person/Quentin.Nenon</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Quentin.Nenon</PersonID>
                 <Role>DataProducer</Role>
             </Contact>   
 	    <Contact>
-                <PersonID>spase://CNES/Person/Christopher.Paranicas</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Christopher.Paranicas</PersonID>
                 <Role>CoInvestigator</Role>
             </Contact>
 	    <Contact>
-                <PersonID>spase://CNES/Person/Norbert.Krupp</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Norbert.Krupp</PersonID>
                 <Role>CoInvestigator</Role>
             </Contact>
             <Association>
diff --git a/NumericalData/CDPP-AMDA/Galileo/EPD/gll-epd-survion.xml b/NumericalData/CDPP-AMDA/Galileo/EPD/gll-epd-survion.xml
index c7d8bea..20e587b 100644
--- a/NumericalData/CDPP-AMDA/Galileo/EPD/gll-epd-survion.xml
+++ b/NumericalData/CDPP-AMDA/Galileo/EPD/gll-epd-survion.xml
@@ -45,19 +45,19 @@ detail in Kollmann et al. [2018, JGR].
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/Peter.Kollmann</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Peter.Kollmann</PersonID>
                 <Role>DataProducer</Role>
             </Contact>  
             <Contact>
-                <PersonID>spase://CNES/Person/Quentin.Nenon</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Quentin.Nenon</PersonID>
                 <Role>DataProducer</Role>
             </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/Christopher.Paranicas</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Christopher.Paranicas</PersonID>
                 <Role>CoInvestigator</Role>
             </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/Norbert.Krupp</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Norbert.Krupp</PersonID>
                 <Role>CoInvestigator</Role>
             </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Galileo/MAG/gll-mag-burst.xml b/NumericalData/CDPP-AMDA/Galileo/MAG/gll-mag-burst.xml
index 18c42df..58b8164 100644
--- a/NumericalData/CDPP-AMDA/Galileo/MAG/gll-mag-burst.xml
+++ b/NumericalData/CDPP-AMDA/Galileo/MAG/gll-mag-burst.xml
@@ -38,7 +38,7 @@
                 <Role>PrincipalInvestigator</Role>
             </Contact>
              <Contact>
-            <PersonID>spase://CNES/Person/Steven.Joy</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Steven.Joy</PersonID>
                 <Role>DataProducer</Role>
             </Contact> 
         </ResourceHeader>
diff --git a/NumericalData/CDPP-AMDA/Galileo/MAG/gll-mag-ca.xml b/NumericalData/CDPP-AMDA/Galileo/MAG/gll-mag-ca.xml
index 32fb963..f68f1c0 100644
--- a/NumericalData/CDPP-AMDA/Galileo/MAG/gll-mag-ca.xml
+++ b/NumericalData/CDPP-AMDA/Galileo/MAG/gll-mag-ca.xml
@@ -25,7 +25,7 @@ Coordinate systems
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/Steven.Joy</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Steven.Joy</PersonID>
                 <Role>DataProducer</Role>
             </Contact>
         </ResourceHeader>
diff --git a/NumericalData/CDPP-AMDA/Galileo/MAG/gll-mag-eu.xml b/NumericalData/CDPP-AMDA/Galileo/MAG/gll-mag-eu.xml
index 4ecbdca..a904b77 100644
--- a/NumericalData/CDPP-AMDA/Galileo/MAG/gll-mag-eu.xml
+++ b/NumericalData/CDPP-AMDA/Galileo/MAG/gll-mag-eu.xml
@@ -27,7 +27,7 @@ Coordinate systems
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <Contact>
-            <PersonID>spase://CNES/Person/Steven.Joy</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Steven.Joy</PersonID>
                 <Role>DataProducer</Role>
             </Contact> 
         </ResourceHeader>
diff --git a/NumericalData/CDPP-AMDA/Galileo/MAG/gll-mag-ga.xml b/NumericalData/CDPP-AMDA/Galileo/MAG/gll-mag-ga.xml
index b5a022a..4540fa1 100644
--- a/NumericalData/CDPP-AMDA/Galileo/MAG/gll-mag-ga.xml
+++ b/NumericalData/CDPP-AMDA/Galileo/MAG/gll-mag-ga.xml
@@ -26,7 +26,7 @@
                 <Role>PrincipalInvestigator</Role>
             </Contact>
              <Contact>
-            <PersonID>spase://CNES/Person/Steven.Joy</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Steven.Joy</PersonID>
                 <Role>DataProducer</Role>
             </Contact> 
         </ResourceHeader>
diff --git a/NumericalData/CDPP-AMDA/Galileo/MAG/gll-mag-io.xml b/NumericalData/CDPP-AMDA/Galileo/MAG/gll-mag-io.xml
index 4804b32..bf7a15a 100644
--- a/NumericalData/CDPP-AMDA/Galileo/MAG/gll-mag-io.xml
+++ b/NumericalData/CDPP-AMDA/Galileo/MAG/gll-mag-io.xml
@@ -23,7 +23,7 @@ Coordinate systems
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <Contact>
-            <PersonID>spase://CNES/Person/Steven.Joy</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Steven.Joy</PersonID>
                 <Role>DataProducer</Role>
             </Contact>  
         </ResourceHeader>
diff --git a/NumericalData/CDPP-AMDA/Galileo/MAG/gll-mag-msreal.xml b/NumericalData/CDPP-AMDA/Galileo/MAG/gll-mag-msreal.xml
index 6ade315..57dadd8 100644
--- a/NumericalData/CDPP-AMDA/Galileo/MAG/gll-mag-msreal.xml
+++ b/NumericalData/CDPP-AMDA/Galileo/MAG/gll-mag-msreal.xml
@@ -14,7 +14,7 @@
                 <Role>PrincipalInvestigator</Role>
             </Contact> 
             <Contact>
-              <PersonID>spase://CNES/Person/Steven.Joy</PersonID>
+              <PersonID>spase://CNES/Person/CDPP-AMDA/Steven.Joy</PersonID>
                 <Role>DataProducer</Role>
             </Contact>
         </ResourceHeader>
diff --git a/NumericalData/CDPP-AMDA/Galileo/Models/gll-mod-khurana.xml b/NumericalData/CDPP-AMDA/Galileo/Models/gll-mod-khurana.xml
index 6c4e977..fa3542a 100644
--- a/NumericalData/CDPP-AMDA/Galileo/Models/gll-mod-khurana.xml
+++ b/NumericalData/CDPP-AMDA/Galileo/Models/gll-mod-khurana.xml
@@ -10,7 +10,7 @@
             Calculated with IDL code for Galileo mission.</Description>
          <Acknowledgement/>                    
          <Contact>        
-            <PersonID>spase://CNES/Person/Krishan.Khurana</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Krishan.Khurana</PersonID>
             <Role>PrincipalInvestigator</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Galileo/Models/gll-mod-onera.xml b/NumericalData/CDPP-AMDA/Galileo/Models/gll-mod-onera.xml
index 037b07a..44312a4 100644
--- a/NumericalData/CDPP-AMDA/Galileo/Models/gll-mod-onera.xml
+++ b/NumericalData/CDPP-AMDA/Galileo/Models/gll-mod-onera.xml
@@ -11,7 +11,7 @@
          library developed at ONERA and using Khurana magnetic field model.</Description>                                
          <Acknowledgement/>                     
          <Contact>        
-            <PersonID>spase://CNES/Person/A.Sicard</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/A.Sicard</PersonID>
             <Role>DataProducer</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Galileo/Moons_Ephemeris/cal-eph-pol.xml b/NumericalData/CDPP-AMDA/Galileo/Moons_Ephemeris/cal-eph-pol.xml
index 5f06a53..c5b4c2e 100644
--- a/NumericalData/CDPP-AMDA/Galileo/Moons_Ephemeris/cal-eph-pol.xml
+++ b/NumericalData/CDPP-AMDA/Galileo/Moons_Ephemeris/cal-eph-pol.xml
@@ -9,7 +9,7 @@
          <Description>Some special Jovian moons ephemeris calculated by Joseph Groene tool (University of Iowa)</Description>                                
          <Acknowledgement/>            
           <Contact>       
-                <PersonID>spase://CNES/Person/Joseph.Groene</PersonID> 
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Joseph.Groene</PersonID> 
                 <Role>DataProducer</Role>
             </Contact> 
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Galileo/Moons_Ephemeris/eur-eph-pol.xml b/NumericalData/CDPP-AMDA/Galileo/Moons_Ephemeris/eur-eph-pol.xml
index 0f2d0e7..d0b3ce6 100644
--- a/NumericalData/CDPP-AMDA/Galileo/Moons_Ephemeris/eur-eph-pol.xml
+++ b/NumericalData/CDPP-AMDA/Galileo/Moons_Ephemeris/eur-eph-pol.xml
@@ -9,7 +9,7 @@
           <Description>Some special Jovian moons ephemeris calculated by Joseph Groene tool (University of Iowa)</Description>                                
          <Acknowledgement/>            
           <Contact>       
-                <PersonID>spase://CNES/Person/Joseph.Groene</PersonID> 
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Joseph.Groene</PersonID> 
                 <Role>DataProducer</Role>
             </Contact> 
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Galileo/Moons_Ephemeris/gan-eph-pol.xml b/NumericalData/CDPP-AMDA/Galileo/Moons_Ephemeris/gan-eph-pol.xml
index 3d6f41f..4132e13 100644
--- a/NumericalData/CDPP-AMDA/Galileo/Moons_Ephemeris/gan-eph-pol.xml
+++ b/NumericalData/CDPP-AMDA/Galileo/Moons_Ephemeris/gan-eph-pol.xml
@@ -9,7 +9,7 @@
         <Description>Some special Jovian moons ephemeris calculated by Joseph Groene tool (University of Iowa)</Description>                                
          <Acknowledgement/>            
           <Contact>       
-                <PersonID>spase://CNES/Person/Joseph.Groene</PersonID> 
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Joseph.Groene</PersonID> 
                 <Role>DataProducer</Role>
             </Contact> 
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Galileo/Moons_Ephemeris/io-eph-pol.xml b/NumericalData/CDPP-AMDA/Galileo/Moons_Ephemeris/io-eph-pol.xml
index 2215bd2..9e45332 100644
--- a/NumericalData/CDPP-AMDA/Galileo/Moons_Ephemeris/io-eph-pol.xml
+++ b/NumericalData/CDPP-AMDA/Galileo/Moons_Ephemeris/io-eph-pol.xml
@@ -9,7 +9,7 @@
           <Description>Some special Jovian moons ephemeris calculated by Joseph Groene tool (University of Iowa)</Description>                                
          <Acknowledgement/>            
           <Contact>       
-                <PersonID>spase://CNES/Person/Joseph.Groene</PersonID> 
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Joseph.Groene</PersonID> 
                 <Role>DataProducer</Role>
             </Contact> 
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Galileo/PLS/gll-pls-fit.xml b/NumericalData/CDPP-AMDA/Galileo/PLS/gll-pls-fit.xml
index 22f41d9..b7cd1f2 100644
--- a/NumericalData/CDPP-AMDA/Galileo/PLS/gll-pls-fit.xml
+++ b/NumericalData/CDPP-AMDA/Galileo/PLS/gll-pls-fit.xml
@@ -16,7 +16,7 @@
                 (2016), Survey of Galileo plasma observations in Jupiter's plasma sheet,  
                 J. Geophys. Res. Planets, 121, 871-894, doi:10.1002/2016JE005009.</Description>
             <Contact>
-              <PersonID>spase://CNES/Person/F.Bagenal</PersonID>
+              <PersonID>spase://CNES/Person/CDPP-AMDA/F.Bagenal</PersonID>
                 <Role>DataProducer</Role>
             </Contact>
         </ResourceHeader>
diff --git a/NumericalData/CDPP-AMDA/Galileo/PLS/gll-pls-mom.xml b/NumericalData/CDPP-AMDA/Galileo/PLS/gll-pls-mom.xml
index 4466cba..69b651c 100644
--- a/NumericalData/CDPP-AMDA/Galileo/PLS/gll-pls-mom.xml
+++ b/NumericalData/CDPP-AMDA/Galileo/PLS/gll-pls-mom.xml
@@ -8,7 +8,7 @@
             <ReleaseDate>2015-10-12T10:50:00.000Z</ReleaseDate>
             <Description>Galileo Plasma Science Spectometer data (moments)</Description>
             <Contact>
-              <PersonID>spase://CNES/Person/R.Walker</PersonID>
+              <PersonID>spase://CNES/Person/CDPP-AMDA/R.Walker</PersonID>
                 <Role>DataProducer</Role>
             </Contact>
         </ResourceHeader>
diff --git a/NumericalData/CDPP-AMDA/Galileo/ephemeris/gll-eph-pol.xml b/NumericalData/CDPP-AMDA/Galileo/ephemeris/gll-eph-pol.xml
index db5718b..694c7cc 100644
--- a/NumericalData/CDPP-AMDA/Galileo/ephemeris/gll-eph-pol.xml
+++ b/NumericalData/CDPP-AMDA/Galileo/ephemeris/gll-eph-pol.xml
@@ -9,7 +9,7 @@
             <ReleaseDate>2018-10-07T11:25:00.000Z</ReleaseDate>
             <Description>Some special Galileo ephemeris calculated by Joseph Groene tool (University of Iowa)</Description>
             <Contact>       
-                <PersonID>spase://CNES/Person/Joseph.Groene</PersonID> 
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Joseph.Groene</PersonID> 
                 <Role>DataProducer</Role>
             </Contact> 
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Galileo/ephemeris/gll-orb-burst.xml b/NumericalData/CDPP-AMDA/Galileo/ephemeris/gll-orb-burst.xml
index 989c0f8..e2523c0 100644
--- a/NumericalData/CDPP-AMDA/Galileo/ephemeris/gll-orb-burst.xml
+++ b/NumericalData/CDPP-AMDA/Galileo/ephemeris/gll-orb-burst.xml
@@ -35,7 +35,7 @@
                 <Role>PrincipalInvestigator</Role>
             </Contact>
              <Contact>
-            <PersonID>spase://CNES/Person/Steven.Joy</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Steven.Joy</PersonID>
                 <Role>DataProducer</Role>
             </Contact>   
         </ResourceHeader>
diff --git a/NumericalData/CDPP-AMDA/Galileo/ephemeris/gll-orb-ca.xml b/NumericalData/CDPP-AMDA/Galileo/ephemeris/gll-orb-ca.xml
index f9c45bb..9c08cad 100644
--- a/NumericalData/CDPP-AMDA/Galileo/ephemeris/gll-orb-ca.xml
+++ b/NumericalData/CDPP-AMDA/Galileo/ephemeris/gll-orb-ca.xml
@@ -23,7 +23,7 @@
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/Steven.Joy</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Steven.Joy</PersonID>
                 <Role>DataProducer</Role>
             </Contact>
         </ResourceHeader>
diff --git a/NumericalData/CDPP-AMDA/Galileo/ephemeris/gll-orb-eu.xml b/NumericalData/CDPP-AMDA/Galileo/ephemeris/gll-orb-eu.xml
index 21f4d83..49b7fca 100644
--- a/NumericalData/CDPP-AMDA/Galileo/ephemeris/gll-orb-eu.xml
+++ b/NumericalData/CDPP-AMDA/Galileo/ephemeris/gll-orb-eu.xml
@@ -25,7 +25,7 @@
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <Contact>
-            <PersonID>spase://CNES/Person/Steven.Joy</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Steven.Joy</PersonID>
                 <Role>DataProducer</Role>
             </Contact>    
         </ResourceHeader>
diff --git a/NumericalData/CDPP-AMDA/Galileo/ephemeris/gll-orb-ga.xml b/NumericalData/CDPP-AMDA/Galileo/ephemeris/gll-orb-ga.xml
index c9e9cba..d92bba3 100644
--- a/NumericalData/CDPP-AMDA/Galileo/ephemeris/gll-orb-ga.xml
+++ b/NumericalData/CDPP-AMDA/Galileo/ephemeris/gll-orb-ga.xml
@@ -25,7 +25,7 @@
                 <Role>PrincipalInvestigator</Role>
             </Contact>
              <Contact>
-            <PersonID>spase://CNES/Person/Steven.Joy</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Steven.Joy</PersonID>
                 <Role>DataProducer</Role>
             </Contact>     
         </ResourceHeader>
diff --git a/NumericalData/CDPP-AMDA/Galileo/ephemeris/gll-orb-io.xml b/NumericalData/CDPP-AMDA/Galileo/ephemeris/gll-orb-io.xml
index ad9bdce..288aac4 100644
--- a/NumericalData/CDPP-AMDA/Galileo/ephemeris/gll-orb-io.xml
+++ b/NumericalData/CDPP-AMDA/Galileo/ephemeris/gll-orb-io.xml
@@ -22,7 +22,7 @@
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <Contact>
-            <PersonID>spase://CNES/Person/Steven.Joy</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Steven.Joy</PersonID>
                 <Role>DataProducer</Role>
             </Contact>     
         </ResourceHeader>
diff --git a/NumericalData/CDPP-AMDA/Galileo/ephemeris/gll-orbit-jup.xml b/NumericalData/CDPP-AMDA/Galileo/ephemeris/gll-orbit-jup.xml
index c04333f..6025e31 100644
--- a/NumericalData/CDPP-AMDA/Galileo/ephemeris/gll-orbit-jup.xml
+++ b/NumericalData/CDPP-AMDA/Galileo/ephemeris/gll-orbit-jup.xml
@@ -9,11 +9,11 @@
             <ReleaseDate>2018-10-07T11:25:00.000Z</ReleaseDate>
             <Description>Galileo Ephemeris are calculated in IRAP by using Galileo SPICE kernels</Description>
              <Contact>       
-                 <PersonID>spase://CNES/Person/NAIF</PersonID> 
+                 <PersonID>spase://CNES/Person/CDPP-AMDA/NAIF</PersonID> 
                  <Role>PrincipalInvestigator</Role>
              </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/Elena.Budnik</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Elena.Budnik</PersonID>
                 <Role>TechnicalContact</Role>
             </Contact>
         </ResourceHeader>
diff --git a/NumericalData/CDPP-AMDA/Helios1/AUX/helios1-aux-corefit.xml b/NumericalData/CDPP-AMDA/Helios1/AUX/helios1-aux-corefit.xml
index 466f664..271570d 100644
--- a/NumericalData/CDPP-AMDA/Helios1/AUX/helios1-aux-corefit.xml
+++ b/NumericalData/CDPP-AMDA/Helios1/AUX/helios1-aux-corefit.xml
@@ -11,7 +11,7 @@
 </Description>                                
        <Acknowledgement>Please acknowledge David Stansby in any publication</Acknowledgement>         
       <Contact>       
-        <PersonID>spase://CNES/Person/David.Stansby</PersonID> 
+        <PersonID>spase://CNES/Person/CDPP-AMDA/David.Stansby</PersonID> 
         <Role>DataProducer</Role>
       </Contact>
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Helios1/E1/helios1-e1-all.xml b/NumericalData/CDPP-AMDA/Helios1/E1/helios1-e1-all.xml
index a8ef6d7..81f01a1 100644
--- a/NumericalData/CDPP-AMDA/Helios1/E1/helios1-e1-all.xml
+++ b/NumericalData/CDPP-AMDA/Helios1/E1/helios1-e1-all.xml
@@ -13,7 +13,7 @@ solar wind created from systematic fitting of all the original Helios 3D distri
 </Description>                                
        <Acknowledgement>Please acknowledge Helios E1 team and David Stansby in any publication</Acknowledgement>         
       <Contact>       
-        <PersonID>spase://CNES/Person/David.Stansby</PersonID> 
+        <PersonID>spase://CNES/Person/CDPP-AMDA/David.Stansby</PersonID> 
         <Role>DataProducer</Role>
       </Contact>
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Helios1/E3/helios1-e3-all.xml b/NumericalData/CDPP-AMDA/Helios1/E3/helios1-e3-all.xml
index e3e65a0..c33cc55 100644
--- a/NumericalData/CDPP-AMDA/Helios1/E3/helios1-e3-all.xml
+++ b/NumericalData/CDPP-AMDA/Helios1/E3/helios1-e3-all.xml
@@ -17,7 +17,7 @@
 </Description>                                
        <Acknowledgement>Please acknowledge Helios E3 team in any publication</Acknowledgement>         
       <Contact>       
-        <PersonID>spase://CNES/Person/David.Stansby</PersonID> 
+        <PersonID>spase://CNES/Person/CDPP-AMDA/David.Stansby</PersonID> 
         <Role>DataProducer</Role>
       </Contact>
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Helios1/MAG/helios1-mag-corefit.xml b/NumericalData/CDPP-AMDA/Helios1/MAG/helios1-mag-corefit.xml
index d159817..cf7acfc 100644
--- a/NumericalData/CDPP-AMDA/Helios1/MAG/helios1-mag-corefit.xml
+++ b/NumericalData/CDPP-AMDA/Helios1/MAG/helios1-mag-corefit.xml
@@ -11,7 +11,7 @@
 </Description>                                
        <Acknowledgement>Please acknowledge Helios E2, E3 team and David Stansby in any publication</Acknowledgement>         
       <Contact>       
-        <PersonID>spase://CNES/Person/David.Stansby</PersonID> 
+        <PersonID>spase://CNES/Person/CDPP-AMDA/David.Stansby</PersonID> 
         <Role>DataProducer</Role>
       </Contact>
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Helios1/ephemeris/helios1-orb-all.xml b/NumericalData/CDPP-AMDA/Helios1/ephemeris/helios1-orb-all.xml
index 044dbd0..a4f9233 100644
--- a/NumericalData/CDPP-AMDA/Helios1/ephemeris/helios1-orb-all.xml
+++ b/NumericalData/CDPP-AMDA/Helios1/ephemeris/helios1-orb-all.xml
@@ -10,11 +10,11 @@
          <Description/>                                
          <Acknowledgement/>
          <Contact>                    
-          <PersonID>spase://CNES/Person/NAIF</PersonID> 
+          <PersonID>spase://CNES/Person/CDPP-AMDA/NAIF</PersonID> 
         <Role>PrincipalInvestigator</Role>
       </Contact>
       <Contact>       
-        <PersonID>spase://CNES/Person/Elena.Budnik</PersonID> 
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Elena.Budnik</PersonID> 
         <Role>TechnicalContact</Role>
       </Contact>
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Helios2/AUX/helios2-aux-corefit.xml b/NumericalData/CDPP-AMDA/Helios2/AUX/helios2-aux-corefit.xml
index dc6167a..e15661e 100644
--- a/NumericalData/CDPP-AMDA/Helios2/AUX/helios2-aux-corefit.xml
+++ b/NumericalData/CDPP-AMDA/Helios2/AUX/helios2-aux-corefit.xml
@@ -10,7 +10,7 @@
          <Description> </Description>                                
        <Acknowledgement>Please acknowledge David Stansby in any publication</Acknowledgement>         
       <Contact>       
-        <PersonID>spase://CNES/Person/David.Stansby</PersonID> 
+        <PersonID>spase://CNES/Person/CDPP-AMDA/David.Stansby</PersonID> 
         <Role>DataProducer</Role>
       </Contact>
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Helios2/E1/helios2-e1-all.xml b/NumericalData/CDPP-AMDA/Helios2/E1/helios2-e1-all.xml
index 027ab90..3aa1ab9 100644
--- a/NumericalData/CDPP-AMDA/Helios2/E1/helios2-e1-all.xml
+++ b/NumericalData/CDPP-AMDA/Helios2/E1/helios2-e1-all.xml
@@ -13,7 +13,7 @@ solar wind created from systematic fitting of all the original Helios 3D distri
 </Description>                                
        <Acknowledgement>Please acknowledge Helios E1 team and David Stansby in any publication</Acknowledgement>         
       <Contact>       
-        <PersonID>spase://CNES/Person/David.Stansby</PersonID> 
+        <PersonID>spase://CNES/Person/CDPP-AMDA/David.Stansby</PersonID> 
         <Role>DataProducer</Role>
       </Contact>
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Helios2/E3/helios2-e3-all.xml b/NumericalData/CDPP-AMDA/Helios2/E3/helios2-e3-all.xml
index a244846..fd162e0 100644
--- a/NumericalData/CDPP-AMDA/Helios2/E3/helios2-e3-all.xml
+++ b/NumericalData/CDPP-AMDA/Helios2/E3/helios2-e3-all.xml
@@ -17,7 +17,7 @@
 </Description>                                
        <Acknowledgement>Please acknowledge Helios 2 E3 team in any publication</Acknowledgement>         
       <Contact>       
-        <PersonID>spase://CNES/Person/David.Stansby</PersonID> 
+        <PersonID>spase://CNES/Person/CDPP-AMDA/David.Stansby</PersonID> 
         <Role>DataProducer</Role>
       </Contact>
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Helios2/MAG/helios2-mag-corefit.xml b/NumericalData/CDPP-AMDA/Helios2/MAG/helios2-mag-corefit.xml
index 0a6480c..be222ed 100644
--- a/NumericalData/CDPP-AMDA/Helios2/MAG/helios2-mag-corefit.xml
+++ b/NumericalData/CDPP-AMDA/Helios2/MAG/helios2-mag-corefit.xml
@@ -11,7 +11,7 @@
 </Description>                                
        <Acknowledgement>Please acknowledge Helios E2, E3 team and David Stansby in any publication</Acknowledgement>         
       <Contact>       
-        <PersonID>spase://CNES/Person/David.Stansby</PersonID> 
+        <PersonID>spase://CNES/Person/CDPP-AMDA/David.Stansby</PersonID> 
         <Role>DataProducer</Role>
       </Contact>
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Helios2/ephemeris/helios2-orb-all.xml b/NumericalData/CDPP-AMDA/Helios2/ephemeris/helios2-orb-all.xml
index 8b07335..fea0009 100644
--- a/NumericalData/CDPP-AMDA/Helios2/ephemeris/helios2-orb-all.xml
+++ b/NumericalData/CDPP-AMDA/Helios2/ephemeris/helios2-orb-all.xml
@@ -10,11 +10,11 @@
          <Description/>                                
          <Acknowledgement/>
          <Contact>                    
-          <PersonID>spase://CNES/Person/NAIF</PersonID> 
+          <PersonID>spase://CNES/Person/CDPP-AMDA/NAIF</PersonID> 
         <Role>PrincipalInvestigator</Role>
       </Contact>
       <Contact>       
-        <PersonID>spase://CNES/Person/Elena.Budnik</PersonID> 
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Elena.Budnik</PersonID> 
         <Role>TechnicalContact</Role>
       </Contact>
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/INTERBALL-Tail/CORALL/intt-crl-kp.xml b/NumericalData/CDPP-AMDA/INTERBALL-Tail/CORALL/intt-crl-kp.xml
index 73d713b..aa3c2b4 100644
--- a/NumericalData/CDPP-AMDA/INTERBALL-Tail/CORALL/intt-crl-kp.xml
+++ b/NumericalData/CDPP-AMDA/INTERBALL-Tail/CORALL/intt-crl-kp.xml
@@ -8,7 +8,7 @@
       <ReleaseDate>2015-10-16T19:34:56.789</ReleaseDate>
       <Description/>
       <Contact>
-        <PersonID>spase://CNES/Person/Andrey.Fedorov</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Andrey.Fedorov</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>
     </ResourceHeader>
diff --git a/NumericalData/CDPP-AMDA/INTERBALL-Tail/DOK2/iball-dok-1s.xml b/NumericalData/CDPP-AMDA/INTERBALL-Tail/DOK2/iball-dok-1s.xml
index 54794a6..aef052a 100644
--- a/NumericalData/CDPP-AMDA/INTERBALL-Tail/DOK2/iball-dok-1s.xml
+++ b/NumericalData/CDPP-AMDA/INTERBALL-Tail/DOK2/iball-dok-1s.xml
@@ -9,11 +9,11 @@
       <ReleaseDate>2015-10-16T19:34:56.789</ReleaseDate>
       <Description/>
       <Contact>
-        <PersonID>spase://CNES/Person/Volt.Lutsenko</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Volt.Lutsenko</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>
       <Contact>
-        <PersonID>spase://CNES/Person/Karel.Kudela</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Karel.Kudela</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact> 
       <Association>
diff --git a/NumericalData/CDPP-AMDA/INTERBALL-Tail/DOK2/iball-dok-1t.xml b/NumericalData/CDPP-AMDA/INTERBALL-Tail/DOK2/iball-dok-1t.xml
index 714f309..7d061e5 100644
--- a/NumericalData/CDPP-AMDA/INTERBALL-Tail/DOK2/iball-dok-1t.xml
+++ b/NumericalData/CDPP-AMDA/INTERBALL-Tail/DOK2/iball-dok-1t.xml
@@ -9,11 +9,11 @@
       <ReleaseDate>2015-10-16T19:34:56.789</ReleaseDate>
       <Description/>
       <Contact>
-        <PersonID>spase://CNES/Person/Volt.Lutsenko</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Volt.Lutsenko</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>
       <Contact>
-        <PersonID>spase://CNES/Person/Karel.Kudela</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Karel.Kudela</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact> 
       <Association>
diff --git a/NumericalData/CDPP-AMDA/INTERBALL-Tail/DOK2/iball-dok-2s.xml b/NumericalData/CDPP-AMDA/INTERBALL-Tail/DOK2/iball-dok-2s.xml
index ab7222c..854d987 100644
--- a/NumericalData/CDPP-AMDA/INTERBALL-Tail/DOK2/iball-dok-2s.xml
+++ b/NumericalData/CDPP-AMDA/INTERBALL-Tail/DOK2/iball-dok-2s.xml
@@ -9,11 +9,11 @@
       <ReleaseDate>2015-10-16T19:34:56.789</ReleaseDate>
       <Description/>
       <Contact>
-        <PersonID>spase://CNES/Person/Volt.Lutsenko</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Volt.Lutsenko</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>
       <Contact>
-        <PersonID>spase://CNES/Person/Karel.Kudela</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Karel.Kudela</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact> 
       <Association>
diff --git a/NumericalData/CDPP-AMDA/INTERBALL-Tail/DOK2/iball-dok-2t.xml b/NumericalData/CDPP-AMDA/INTERBALL-Tail/DOK2/iball-dok-2t.xml
index 1b48ca7..dd9d46f 100644
--- a/NumericalData/CDPP-AMDA/INTERBALL-Tail/DOK2/iball-dok-2t.xml
+++ b/NumericalData/CDPP-AMDA/INTERBALL-Tail/DOK2/iball-dok-2t.xml
@@ -9,11 +9,11 @@
       <ReleaseDate>2015-10-16T19:34:56.789</ReleaseDate>
       <Description/>
       <Contact>
-        <PersonID>spase://CNES/Person/Volt.Lutsenko</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Volt.Lutsenko</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>
       <Contact>
-        <PersonID>spase://CNES/Person/Karel.Kudela</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Karel.Kudela</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>  
       <Association>
diff --git a/NumericalData/CDPP-AMDA/INTERBALL-Tail/DOK2/iball-dok-3s.xml b/NumericalData/CDPP-AMDA/INTERBALL-Tail/DOK2/iball-dok-3s.xml
index bcf2cf5..f31179e 100644
--- a/NumericalData/CDPP-AMDA/INTERBALL-Tail/DOK2/iball-dok-3s.xml
+++ b/NumericalData/CDPP-AMDA/INTERBALL-Tail/DOK2/iball-dok-3s.xml
@@ -9,11 +9,11 @@
       <ReleaseDate>2015-10-16T19:34:56.789</ReleaseDate>
       <Description/>
       <Contact>
-        <PersonID>spase://CNES/Person/Volt.Lutsenko</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Volt.Lutsenko</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>
       <Contact>
-        <PersonID>spase://CNES/Person/Karel.Kudela</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Karel.Kudela</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact> 
       <Association>
diff --git a/NumericalData/CDPP-AMDA/INTERBALL-Tail/DOK2/iball-dok-3t.xml b/NumericalData/CDPP-AMDA/INTERBALL-Tail/DOK2/iball-dok-3t.xml
index 4fbb299..f8be912 100644
--- a/NumericalData/CDPP-AMDA/INTERBALL-Tail/DOK2/iball-dok-3t.xml
+++ b/NumericalData/CDPP-AMDA/INTERBALL-Tail/DOK2/iball-dok-3t.xml
@@ -9,11 +9,11 @@
       <ReleaseDate>2015-10-16T19:34:56.789</ReleaseDate>
       <Description/>
       <Contact>
-        <PersonID>spase://CNES/Person/Volt.Lutsenko</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Volt.Lutsenko</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>
       <Contact>
-        <PersonID>spase://CNES/Person/Karel.Kudela</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Karel.Kudela</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>
       <Association>
diff --git a/NumericalData/CDPP-AMDA/INTERBALL-Tail/DOK2/iball-dok-4s.xml b/NumericalData/CDPP-AMDA/INTERBALL-Tail/DOK2/iball-dok-4s.xml
index 1b29e68..d6488a0 100644
--- a/NumericalData/CDPP-AMDA/INTERBALL-Tail/DOK2/iball-dok-4s.xml
+++ b/NumericalData/CDPP-AMDA/INTERBALL-Tail/DOK2/iball-dok-4s.xml
@@ -9,11 +9,11 @@
       <ReleaseDate>2015-10-16T19:34:56.789</ReleaseDate>
       <Description/>
       <Contact>
-        <PersonID>spase://CNES/Person/Volt.Lutsenko</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Volt.Lutsenko</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>
       <Contact>
-        <PersonID>spase://CNES/Person/Karel.Kudela</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Karel.Kudela</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact> 
       <Association>
diff --git a/NumericalData/CDPP-AMDA/INTERBALL-Tail/DOK2/iball-dok-4t.xml b/NumericalData/CDPP-AMDA/INTERBALL-Tail/DOK2/iball-dok-4t.xml
index 7202cd5..869f75e 100644
--- a/NumericalData/CDPP-AMDA/INTERBALL-Tail/DOK2/iball-dok-4t.xml
+++ b/NumericalData/CDPP-AMDA/INTERBALL-Tail/DOK2/iball-dok-4t.xml
@@ -9,11 +9,11 @@
       <ReleaseDate>2015-10-16T19:34:56.789</ReleaseDate>
       <Description/>
       <Contact>
-        <PersonID>spase://CNES/Person/Volt.Lutsenko</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Volt.Lutsenko</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>
       <Contact>
-        <PersonID>spase://CNES/Person/Karel.Kudela</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Karel.Kudela</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>  
       <Association>
diff --git a/NumericalData/CDPP-AMDA/INTERBALL-Tail/Models/it-msph-models.xml b/NumericalData/CDPP-AMDA/INTERBALL-Tail/Models/it-msph-models.xml
index 5cfb6ae..257e3f2 100644
--- a/NumericalData/CDPP-AMDA/INTERBALL-Tail/Models/it-msph-models.xml
+++ b/NumericalData/CDPP-AMDA/INTERBALL-Tail/Models/it-msph-models.xml
@@ -12,7 +12,7 @@
          </Description>
          <Acknowledgement>TBD</Acknowledgement> 
          <Contact>
-            <PersonID>spase://CNES/Person/Christian.Jacquey</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Christian.Jacquey</PersonID>
             <Role>TechnicalContact</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/INTERBALL-Tail/Models/it-t96-model.xml b/NumericalData/CDPP-AMDA/INTERBALL-Tail/Models/it-t96-model.xml
index c4e01e5..c5ae76f 100644
--- a/NumericalData/CDPP-AMDA/INTERBALL-Tail/Models/it-t96-model.xml
+++ b/NumericalData/CDPP-AMDA/INTERBALL-Tail/Models/it-t96-model.xml
@@ -15,7 +15,7 @@
          </Description>
          <Acknowledgement>TBD</Acknowledgement> 
          <Contact>
-         <PersonID>spase://CNES/Person/Nikolai.Tsyganenko</PersonID>
+         <PersonID>spase://CNES/Person/CDPP-AMDA/Nikolai.Tsyganenko</PersonID>
             <Role>PrincipalInvestigator</Role>
          </Contact>            
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/ISEE/ISEE1/FVA/isee1-fva-all.xml b/NumericalData/CDPP-AMDA/ISEE/ISEE1/FVA/isee1-fva-all.xml
index b8247cc..a0a9731 100644
--- a/NumericalData/CDPP-AMDA/ISEE/ISEE1/FVA/isee1-fva-all.xml
+++ b/NumericalData/CDPP-AMDA/ISEE/ISEE1/FVA/isee1-fva-all.xml
@@ -9,7 +9,7 @@
             <Description>Reconstructed in IRAP from CDAWeb CDROM and IAS software.</Description>
             <Acknowledgement/>
             <Contact>
-                <PersonID>spase://CNES/Person/K.A.Anderson</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/K.A.Anderson</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/ISEE/ISEE2/FVA/isee2-fva-all.xml b/NumericalData/CDPP-AMDA/ISEE/ISEE2/FVA/isee2-fva-all.xml
index d4f7c83..8bafdba 100644
--- a/NumericalData/CDPP-AMDA/ISEE/ISEE2/FVA/isee2-fva-all.xml
+++ b/NumericalData/CDPP-AMDA/ISEE/ISEE2/FVA/isee2-fva-all.xml
@@ -9,7 +9,7 @@
             <Description>Reconstructed in IRAP from CDAWeb CDROM and IAS software.</Description>
             <Acknowledgement/>
             <Contact>
-                <PersonID>spase://CNES/Person/K.A.Anderson</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/K.A.Anderson</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Indices/Ground_Based/ground-based-aa.xml b/NumericalData/CDPP-AMDA/Indices/Ground_Based/ground-based-aa.xml
index be973ac..c0f59ac 100644
--- a/NumericalData/CDPP-AMDA/Indices/Ground_Based/ground-based-aa.xml
+++ b/NumericalData/CDPP-AMDA/Indices/Ground_Based/ground-based-aa.xml
@@ -10,7 +10,7 @@
          <Description>Index which purpose is to measure the amplitude of global geomagnetic activity during 3-hour intervals normalized to geomagnetic latitude ±50°. aa was introduced to monitor geomagnetic activity over the longest possible time period.</Description>
          <Acknowledgement>ISGI website at EOST; License: CC BY-NC https://creativecommons.org/licenses/by-nc/4.0/</Acknowledgement>
          <Contact>        
-            <PersonID>spase://CNES/Person/Aude.Chambodut</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Aude.Chambodut</PersonID>
             <Role>TechnicalContact</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Indices/Ground_Based/ground-based-aei.xml b/NumericalData/CDPP-AMDA/Indices/Ground_Based/ground-based-aei.xml
index 854a65c..a0c5a35 100644
--- a/NumericalData/CDPP-AMDA/Indices/Ground_Based/ground-based-aei.xml
+++ b/NumericalData/CDPP-AMDA/Indices/Ground_Based/ground-based-aei.xml
@@ -16,11 +16,11 @@
             <Role>PrincipalInvestigator</Role>
          </Contact>
 	 <Contact>
-            <PersonID>spase://CNES/Person/WDC</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/WDC</PersonID>
             <Role>TechnicalContact</Role>
          </Contact>
 	 <Contact>
-            <PersonID>spase://CNES/Person/Aude.Chambodut</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Aude.Chambodut</PersonID>
             <Role>TechnicalContact</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Indices/Ground_Based/ground-based-am.xml b/NumericalData/CDPP-AMDA/Indices/Ground_Based/ground-based-am.xml
index bf60a26..4bd4000 100644
--- a/NumericalData/CDPP-AMDA/Indices/Ground_Based/ground-based-am.xml
+++ b/NumericalData/CDPP-AMDA/Indices/Ground_Based/ground-based-am.xml
@@ -10,7 +10,7 @@
          <Description>Index which purpose is to provide a characterization of global geomagnetic activity using a large set of stations representing all longitudes and possible hemispheric discrepancies.</Description>
          <Acknowledgement>ISGI website at EOST; License: CC BY-NC https://creativecommons.org/licenses/by-nc/4.0/</Acknowledgement>
          <Contact>        
-            <PersonID>spase://CNES/Person/Aude.Chambodut</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Aude.Chambodut</PersonID>
             <Role>TechnicalContact</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Indices/Ground_Based/ground-based-asy.xml b/NumericalData/CDPP-AMDA/Indices/Ground_Based/ground-based-asy.xml
index 5b31cf5..10db03f 100644
--- a/NumericalData/CDPP-AMDA/Indices/Ground_Based/ground-based-asy.xml
+++ b/NumericalData/CDPP-AMDA/Indices/Ground_Based/ground-based-asy.xml
@@ -15,11 +15,11 @@
             <Role>DataProducer</Role>
          </Contact>
          <Contact>
-            <PersonID>spase://CNES/Person/WDC</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/WDC</PersonID>
             <Role>TechnicalContact</Role>
          </Contact>
          <Contact>
-            <PersonID>spase://CNES/Person/Aude.Chambodut</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Aude.Chambodut</PersonID>
             <Role>TechnicalContact</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Indices/Ground_Based/ground-based-dst.xml b/NumericalData/CDPP-AMDA/Indices/Ground_Based/ground-based-dst.xml
index e29cbc7..d9b492f 100644
--- a/NumericalData/CDPP-AMDA/Indices/Ground_Based/ground-based-dst.xml
+++ b/NumericalData/CDPP-AMDA/Indices/Ground_Based/ground-based-dst.xml
@@ -19,11 +19,11 @@
             <Role>DataProducer</Role>
          </Contact>
          <Contact>
-            <PersonID>spase://CNES/Person/WDC</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/WDC</PersonID>
             <Role>TechnicalContact</Role>
          </Contact>
          <Contact>
-            <PersonID>spase://CNES/Person/Aude.Chambodut</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Aude.Chambodut</PersonID>
             <Role>TechnicalContact</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Juice/Ephemeris/juice-callisto-cr30.xml b/NumericalData/CDPP-AMDA/Juice/Ephemeris/juice-callisto-cr30.xml
index b2ed567..a396cf8 100644
--- a/NumericalData/CDPP-AMDA/Juice/Ephemeris/juice-callisto-cr30.xml
+++ b/NumericalData/CDPP-AMDA/Juice/Ephemeris/juice-callisto-cr30.xml
@@ -11,7 +11,7 @@
          </Description>
          <Acknowledgement/>            
          <Contact>      
-         <PersonID>spase://CNES/Person/ESA.SPICE.Service</PersonID>
+         <PersonID>spase://CNES/Person/CDPP-AMDA/ESA.SPICE.Service</PersonID>
          <Role>PrincipalInvestigator</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Juice/Ephemeris/juice-callisto-cr32.xml b/NumericalData/CDPP-AMDA/Juice/Ephemeris/juice-callisto-cr32.xml
index 2668d12..cefc4a2 100644
--- a/NumericalData/CDPP-AMDA/Juice/Ephemeris/juice-callisto-cr32.xml
+++ b/NumericalData/CDPP-AMDA/Juice/Ephemeris/juice-callisto-cr32.xml
@@ -11,7 +11,7 @@
          CReMA stands for Consolidated Reports on Mission Analysis which describe different mission profiles. They are detailed at https://www.cosmos.esa.int/web/spice/spice-for-juice . Each CReMA corresponds to a specific metakernel.</Description>
          <Acknowledgement/>          
          <Contact>      
-            <PersonID>spase://CNES/Person/ESA.SPICE.Service</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/ESA.SPICE.Service</PersonID>
             <Role>PrincipalInvestigator</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Juice/Ephemeris/juice-callisto-cr41.xml b/NumericalData/CDPP-AMDA/Juice/Ephemeris/juice-callisto-cr41.xml
index 9a8ac5d..2cd4c02 100644
--- a/NumericalData/CDPP-AMDA/Juice/Ephemeris/juice-callisto-cr41.xml
+++ b/NumericalData/CDPP-AMDA/Juice/Ephemeris/juice-callisto-cr41.xml
@@ -11,7 +11,7 @@
          CReMA stands for Consolidated Reports on Mission Analysis which describe different mission profiles. They are detailed at https://www.cosmos.esa.int/web/spice/spice-for-juice . Each CReMA corresponds to a specific metakernel.</Description>
          <Acknowledgement/>            
          <Contact>      
-            <PersonID>spase://CNES/Person/ESA.SPICE.Service</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/ESA.SPICE.Service</PersonID>
             <Role>PrincipalInvestigator</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Juice/Ephemeris/juice-cruise-cr30.xml b/NumericalData/CDPP-AMDA/Juice/Ephemeris/juice-cruise-cr30.xml
index f767a08..9af518d 100644
--- a/NumericalData/CDPP-AMDA/Juice/Ephemeris/juice-cruise-cr30.xml
+++ b/NumericalData/CDPP-AMDA/Juice/Ephemeris/juice-cruise-cr30.xml
@@ -11,7 +11,7 @@
          CReMA stands for Consolidated Reports on Mission Analysis which describe different mission profiles. They are detailed at https://www.cosmos.esa.int/web/spice/spice-for-juice . Each CReMA corresponds to a specific metakernel.</Description>
          <Acknowledgement/>            
          <Contact>      
-            <PersonID>spase://CNES/Person/ESA.SPICE.Service</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/ESA.SPICE.Service</PersonID>
             <Role>PrincipalInvestigator</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Juice/Ephemeris/juice-cruise-cr32.xml b/NumericalData/CDPP-AMDA/Juice/Ephemeris/juice-cruise-cr32.xml
index 92f9e93..5826311 100644
--- a/NumericalData/CDPP-AMDA/Juice/Ephemeris/juice-cruise-cr32.xml
+++ b/NumericalData/CDPP-AMDA/Juice/Ephemeris/juice-cruise-cr32.xml
@@ -11,7 +11,7 @@
          CReMA stands for Consolidated Reports on Mission Analysis which describe different mission profiles. They are detailed at https://www.cosmos.esa.int/web/spice/spice-for-juice . Each CReMA corresponds to a specific metakernel.</Description>
          <Acknowledgement/>            
          <Contact>      
-            <PersonID>spase://CNES/Person/ESA.SPICE.Service</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/ESA.SPICE.Service</PersonID>
             <Role>PrincipalInvestigator</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Juice/Ephemeris/juice-cruise-cr41.xml b/NumericalData/CDPP-AMDA/Juice/Ephemeris/juice-cruise-cr41.xml
index 7218c62..f7e127b 100644
--- a/NumericalData/CDPP-AMDA/Juice/Ephemeris/juice-cruise-cr41.xml
+++ b/NumericalData/CDPP-AMDA/Juice/Ephemeris/juice-cruise-cr41.xml
@@ -11,7 +11,7 @@
          CReMA stands for Consolidated Reports on Mission Analysis which describe different mission profiles. They are detailed at https://www.cosmos.esa.int/web/spice/spice-for-juice . Each CReMA corresponds to a specific metakernel.</Description>
          <Acknowledgement/>            
          <Contact>      
-            <PersonID>spase://CNES/Person/ESA.SPICE.Service</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/ESA.SPICE.Service</PersonID>
             <Role>PrincipalInvestigator</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Juice/Ephemeris/juice-europa-cr30.xml b/NumericalData/CDPP-AMDA/Juice/Ephemeris/juice-europa-cr30.xml
index b00acc3..904f53f 100644
--- a/NumericalData/CDPP-AMDA/Juice/Ephemeris/juice-europa-cr30.xml
+++ b/NumericalData/CDPP-AMDA/Juice/Ephemeris/juice-europa-cr30.xml
@@ -11,7 +11,7 @@
          CReMA stands for Consolidated Reports on Mission Analysis which describe different mission profiles. They are detailed at https://www.cosmos.esa.int/web/spice/spice-for-juice . Each CReMA corresponds to a specific metakernel.</Description>
          <Acknowledgement/>            
          <Contact>      
-            <PersonID>spase://CNES/Person/ESA.SPICE.Service</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/ESA.SPICE.Service</PersonID>
             <Role>PrincipalInvestigator</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Juice/Ephemeris/juice-europa-cr32.xml b/NumericalData/CDPP-AMDA/Juice/Ephemeris/juice-europa-cr32.xml
index e1474ac..5741ebe 100644
--- a/NumericalData/CDPP-AMDA/Juice/Ephemeris/juice-europa-cr32.xml
+++ b/NumericalData/CDPP-AMDA/Juice/Ephemeris/juice-europa-cr32.xml
@@ -11,7 +11,7 @@
         CReMA stands for Consolidated Reports on Mission Analysis which describe different mission profiles. They are detailed at https://www.cosmos.esa.int/web/spice/spice-for-juice . Each CReMA corresponds to a specific metakernel. </Description>
          <Acknowledgement/>            
          <Contact>      
-            <PersonID>spase://CNES/Person/ESA.SPICE.Service</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/ESA.SPICE.Service</PersonID>
             <Role>PrincipalInvestigator</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Juice/Ephemeris/juice-europa-cr41.xml b/NumericalData/CDPP-AMDA/Juice/Ephemeris/juice-europa-cr41.xml
index 7458be7..5162771 100644
--- a/NumericalData/CDPP-AMDA/Juice/Ephemeris/juice-europa-cr41.xml
+++ b/NumericalData/CDPP-AMDA/Juice/Ephemeris/juice-europa-cr41.xml
@@ -11,7 +11,7 @@
          CReMA stands for Consolidated Reports on Mission Analysis which describe different mission profiles. They are detailed at https://www.cosmos.esa.int/web/spice/spice-for-juice . Each CReMA corresponds to a specific metakernel.</Description>
          <Acknowledgement/>            
          <Contact>      
-            <PersonID>spase://CNES/Person/ESA.SPICE.Service</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/ESA.SPICE.Service</PersonID>
             <Role>PrincipalInvestigator</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Juice/Ephemeris/juice-ganymede-cr30.xml b/NumericalData/CDPP-AMDA/Juice/Ephemeris/juice-ganymede-cr30.xml
index dc443fb..8069386 100644
--- a/NumericalData/CDPP-AMDA/Juice/Ephemeris/juice-ganymede-cr30.xml
+++ b/NumericalData/CDPP-AMDA/Juice/Ephemeris/juice-ganymede-cr30.xml
@@ -10,7 +10,7 @@
 	 <Description>CReMA stands for Consolidated Reports on Mission Analysis which describe different mission profiles. They are detailed at https://www.cosmos.esa.int/web/spice/spice-for-juice . Each CReMA corresponds to a specific metakernel.</Description>
          <Acknowledgement/>            
          <Contact>      
-            <PersonID>spase://CNES/Person/ESA.SPICE.Service</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/ESA.SPICE.Service</PersonID>
             <Role>PrincipalInvestigator</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Juice/Ephemeris/juice-ganymede-cr32.xml b/NumericalData/CDPP-AMDA/Juice/Ephemeris/juice-ganymede-cr32.xml
index fbdd1b1..4a7a54f 100644
--- a/NumericalData/CDPP-AMDA/Juice/Ephemeris/juice-ganymede-cr32.xml
+++ b/NumericalData/CDPP-AMDA/Juice/Ephemeris/juice-ganymede-cr32.xml
@@ -10,7 +10,7 @@
 	 <Description>CReMA stands for Consolidated Reports on Mission Analysis which describe different mission profiles. They are detailed at https://www.cosmos.esa.int/web/spice/spice-for-juice . Each CReMA corresponds to a specific metakernel.</Description>
          <Acknowledgement/>            
          <Contact>      
-            <PersonID>spase://CNES/Person/ESA.SPICE.Service</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/ESA.SPICE.Service</PersonID>
             <Role>PrincipalInvestigator</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Juice/Ephemeris/juice-ganymede-cr41.xml b/NumericalData/CDPP-AMDA/Juice/Ephemeris/juice-ganymede-cr41.xml
index 98ca7ed..2379e76 100644
--- a/NumericalData/CDPP-AMDA/Juice/Ephemeris/juice-ganymede-cr41.xml
+++ b/NumericalData/CDPP-AMDA/Juice/Ephemeris/juice-ganymede-cr41.xml
@@ -10,7 +10,7 @@
 	 <Description>CReMA stands for Consolidated Reports on Mission Analysis which describe different mission profiles. They are detailed at https://www.cosmos.esa.int/web/spice/spice-for-juice . Each CReMA corresponds to a specific metakernel.</Description>
          <Acknowledgement/>            
          <Contact>      
-            <PersonID>spase://CNES/Person/ESA.SPICE.Service</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/ESA.SPICE.Service</PersonID>
             <Role>PrincipalInvestigator</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Juice/Ephemeris/juice-jup-cr30.xml b/NumericalData/CDPP-AMDA/Juice/Ephemeris/juice-jup-cr30.xml
index 45b0d64..79ae5c1 100644
--- a/NumericalData/CDPP-AMDA/Juice/Ephemeris/juice-jup-cr30.xml
+++ b/NumericalData/CDPP-AMDA/Juice/Ephemeris/juice-jup-cr30.xml
@@ -13,7 +13,7 @@
          </Description>
          <Acknowledgement/>                     
          <Contact>      
-         <PersonID>spase://CNES/Person/ESA.SPICE.Service</PersonID>
+         <PersonID>spase://CNES/Person/CDPP-AMDA/ESA.SPICE.Service</PersonID>
          <Role>PrincipalInvestigator</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Juice/Ephemeris/juice-jup-cr32.xml b/NumericalData/CDPP-AMDA/Juice/Ephemeris/juice-jup-cr32.xml
index c2b58a1..da9f83d 100644
--- a/NumericalData/CDPP-AMDA/Juice/Ephemeris/juice-jup-cr32.xml
+++ b/NumericalData/CDPP-AMDA/Juice/Ephemeris/juice-jup-cr32.xml
@@ -11,7 +11,7 @@
        CReMA stands for Consolidated Reports on Mission Analysis which describe different mission profiles. They are detailed at https://www.cosmos.esa.int/web/spice/spice-for-juice . Each CReMA corresponds to a specific metakernel.  </Description>
          <Acknowledgement/>            
          <Contact>      
-            <PersonID>spase://CNES/Person/ESA.SPICE.Service</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/ESA.SPICE.Service</PersonID>
             <Role>PrincipalInvestigator</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Juice/Ephemeris/juice-jup-cr41.xml b/NumericalData/CDPP-AMDA/Juice/Ephemeris/juice-jup-cr41.xml
index f664516..aa9bde6 100644
--- a/NumericalData/CDPP-AMDA/Juice/Ephemeris/juice-jup-cr41.xml
+++ b/NumericalData/CDPP-AMDA/Juice/Ephemeris/juice-jup-cr41.xml
@@ -11,7 +11,7 @@
         CReMA stands for Consolidated Reports on Mission Analysis which describe different mission profiles. They are detailed at https://www.cosmos.esa.int/web/spice/spice-for-juice . Each CReMA corresponds to a specific metakernel. </Description>
          <Acknowledgement/>            
          <Contact>      
-            <PersonID>spase://CNES/Person/ESA.SPICE.Service</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/ESA.SPICE.Service</PersonID>
             <Role>PrincipalInvestigator</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Juice/Models/juice30-jrm09-model.xml b/NumericalData/CDPP-AMDA/Juice/Models/juice30-jrm09-model.xml
index 012f6c0..012e058 100644
--- a/NumericalData/CDPP-AMDA/Juice/Models/juice30-jrm09-model.xml
+++ b/NumericalData/CDPP-AMDA/Juice/Models/juice30-jrm09-model.xml
@@ -14,11 +14,11 @@
          </Description>
          <Acknowledgement>TBD</Acknowledgement> 
          <Contact>
-            <PersonID>spase://CNES/Person/Connerney</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Connerney</PersonID>
             <Role>PrincipalInvestigator</Role>
          </Contact>  
          <Contact>
-            <PersonID>spase://CNES/Person/YWang</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/YWang</PersonID>
             <Role>TechnicalContact</Role>
          </Contact> 
          <Association>
diff --git a/NumericalData/CDPP-AMDA/Juice/Models/juice32-jrm09-model.xml b/NumericalData/CDPP-AMDA/Juice/Models/juice32-jrm09-model.xml
index 7a524fd..ff1ddef 100644
--- a/NumericalData/CDPP-AMDA/Juice/Models/juice32-jrm09-model.xml
+++ b/NumericalData/CDPP-AMDA/Juice/Models/juice32-jrm09-model.xml
@@ -14,11 +14,11 @@
          </Description>
          <Acknowledgement>TBD</Acknowledgement> 
          <Contact>
-            <PersonID>spase://CNES/Person/Connerney</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Connerney</PersonID>
             <Role>PrincipalInvestigator</Role>
          </Contact>  
          <Contact>
-            <PersonID>spase://CNES/Person/YWang</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/YWang</PersonID>
             <Role>TechnicalContact</Role>
          </Contact>
          <Association>
diff --git a/NumericalData/CDPP-AMDA/Juice/Models/juice41-jrm09-model.xml b/NumericalData/CDPP-AMDA/Juice/Models/juice41-jrm09-model.xml
index d5f46c5..9c37d09 100644
--- a/NumericalData/CDPP-AMDA/Juice/Models/juice41-jrm09-model.xml
+++ b/NumericalData/CDPP-AMDA/Juice/Models/juice41-jrm09-model.xml
@@ -14,11 +14,11 @@
          </Description>
          <Acknowledgement>TBD</Acknowledgement> 
          <Contact>
-            <PersonID>spase://CNES/Person/Connerney</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Connerney</PersonID>
             <Role>PrincipalInvestigator</Role>
          </Contact>  
          <Contact>
-            <PersonID>spase://CNES/Person/YWang</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/YWang</PersonID>
             <Role>TechnicalContact</Role>
          </Contact> 
          <Association>
diff --git a/NumericalData/CDPP-AMDA/Juno/Ephemeris/juno-cruise-all.xml b/NumericalData/CDPP-AMDA/Juno/Ephemeris/juno-cruise-all.xml
index dc2fe3a..502ec89 100644
--- a/NumericalData/CDPP-AMDA/Juno/Ephemeris/juno-cruise-all.xml
+++ b/NumericalData/CDPP-AMDA/Juno/Ephemeris/juno-cruise-all.xml
@@ -9,7 +9,7 @@
          <Description/>                                 
          <Acknowledgement/>
          <Contact>
-            <PersonID>spase://CNES/Person/NAIF</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/NAIF</PersonID>
             <Role>PrincipalInvestigator</Role>
          </Contact> 
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Juno/Ephemeris/juno-jupiter-all.xml b/NumericalData/CDPP-AMDA/Juno/Ephemeris/juno-jupiter-all.xml
index 3bed9bc..090654a 100644
--- a/NumericalData/CDPP-AMDA/Juno/Ephemeris/juno-jupiter-all.xml
+++ b/NumericalData/CDPP-AMDA/Juno/Ephemeris/juno-jupiter-all.xml
@@ -9,11 +9,11 @@
          <Description/>                                 
          <Acknowledgement/>                     
          <Contact>
-            <PersonID>spase://CNES/Person/NAIF</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/NAIF</PersonID>
             <Role>PrincipalInvestigator</Role>
          </Contact>
          <Contact>
-            <PersonID>spase://CNES/Person/Elena.Budnik</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Elena.Budnik</PersonID>
             <Role>TechnicalContact</Role>
          </Contact> 
          <Association>
diff --git a/NumericalData/CDPP-AMDA/Juno/FGM/juno-fgm-cruise60.xml b/NumericalData/CDPP-AMDA/Juno/FGM/juno-fgm-cruise60.xml
index a518d43..18e818a 100644
--- a/NumericalData/CDPP-AMDA/Juno/FGM/juno-fgm-cruise60.xml
+++ b/NumericalData/CDPP-AMDA/Juno/FGM/juno-fgm-cruise60.xml
@@ -8,11 +8,11 @@
             <ReleaseDate>2017-10-16T15:10:29Z</ReleaseDate>
             <Description />
               <Contact>
-                <PersonID>spase://CNES/Person/John.E.P.Connerney</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/John.E.P.Connerney</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>  
             <Contact>
-                <PersonID>spase://CNES/Person/Patricia.Lawton</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Patricia.Lawton</PersonID>
                 <Role>DataProducer</Role>
             </Contact> 
             <Association>
diff --git a/NumericalData/CDPP-AMDA/Juno/FGM/juno-fgm-orb1.xml b/NumericalData/CDPP-AMDA/Juno/FGM/juno-fgm-orb1.xml
index 1e4dbeb..c5bc29f 100644
--- a/NumericalData/CDPP-AMDA/Juno/FGM/juno-fgm-orb1.xml
+++ b/NumericalData/CDPP-AMDA/Juno/FGM/juno-fgm-orb1.xml
@@ -8,11 +8,11 @@
             <ReleaseDate>2015-10-16T15:10:29Z</ReleaseDate>
             <Description />
             <Contact>
-                <PersonID>spase://CNES/Person/John.E.P.Connerney</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/John.E.P.Connerney</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>  
             <Contact>
-                <PersonID>spase://CNES/Person/Patricia.Lawton</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Patricia.Lawton</PersonID>
                 <Role>DataProducer</Role>
             </Contact>                
             <Association>
diff --git a/NumericalData/CDPP-AMDA/Juno/FGM/juno-fgm-orb60.xml b/NumericalData/CDPP-AMDA/Juno/FGM/juno-fgm-orb60.xml
index 9311979..8e11554 100644
--- a/NumericalData/CDPP-AMDA/Juno/FGM/juno-fgm-orb60.xml
+++ b/NumericalData/CDPP-AMDA/Juno/FGM/juno-fgm-orb60.xml
@@ -8,11 +8,11 @@
             <ReleaseDate>2015-10-16T15:10:29Z</ReleaseDate>
             <Description />
              <Contact>
-                <PersonID>spase://CNES/Person/John.E.P.Connerney</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/John.E.P.Connerney</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>  
             <Contact>
-                <PersonID>spase://CNES/Person/Patricia.Lawton</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Patricia.Lawton</PersonID>
                 <Role>DataProducer</Role>
             </Contact>
             <Association>
diff --git a/NumericalData/CDPP-AMDA/Juno/FGM/juno-fgm-orbfull.xml b/NumericalData/CDPP-AMDA/Juno/FGM/juno-fgm-orbfull.xml
index 61a17be..fc1d2cb 100644
--- a/NumericalData/CDPP-AMDA/Juno/FGM/juno-fgm-orbfull.xml
+++ b/NumericalData/CDPP-AMDA/Juno/FGM/juno-fgm-orbfull.xml
@@ -8,11 +8,11 @@
             <ReleaseDate>2015-10-16T15:10:29Z</ReleaseDate>
             <Description />
              <Contact>
-                <PersonID>spase://CNES/Person/John.E.P.Connerney</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/John.E.P.Connerney</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>  
             <Contact>
-                <PersonID>spase://CNES/Person/Patricia.Lawton</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Patricia.Lawton</PersonID>
                 <Role>DataProducer</Role>
             </Contact>
             <Association>
diff --git a/NumericalData/CDPP-AMDA/Juno/Models/jun-jrm09-model.xml b/NumericalData/CDPP-AMDA/Juno/Models/jun-jrm09-model.xml
index cabf19e..14331a4 100644
--- a/NumericalData/CDPP-AMDA/Juno/Models/jun-jrm09-model.xml
+++ b/NumericalData/CDPP-AMDA/Juno/Models/jun-jrm09-model.xml
@@ -14,11 +14,11 @@
          </Description>
          <Acknowledgement>TBD</Acknowledgement> 
          <Contact>
-            <PersonID>spase://CNES/Person/Connerney</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Connerney</PersonID>
             <Role>PrincipalInvestigator</Role>
          </Contact>  
          <Contact>
-            <PersonID>spase://CNES/Person/YWang</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/YWang</PersonID>
             <Role>TechnicalContact</Role>
          </Contact>   
          <PriorID>juno-jupiter-all</PriorID>      
diff --git a/NumericalData/CDPP-AMDA/MAVEN/EUV/mvn-euv-clb.xml b/NumericalData/CDPP-AMDA/MAVEN/EUV/mvn-euv-clb.xml
index 393aec9..87b5f63 100644
--- a/NumericalData/CDPP-AMDA/MAVEN/EUV/mvn-euv-clb.xml
+++ b/NumericalData/CDPP-AMDA/MAVEN/EUV/mvn-euv-clb.xml
@@ -13,7 +13,7 @@
          <Acknowledgement>Principal Investigator : Frank Eparvier, LASP, Colorado          
          </Acknowledgement>
          <Contact>        
-            <PersonID>spase://CNES/Person/Frank.Eparvier</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Frank.Eparvier</PersonID>
             <Role>PrincipalInvestigator</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/MAVEN/EUV/mvn-euv-mod.xml b/NumericalData/CDPP-AMDA/MAVEN/EUV/mvn-euv-mod.xml
index 1b3dd58..678a752 100644
--- a/NumericalData/CDPP-AMDA/MAVEN/EUV/mvn-euv-mod.xml
+++ b/NumericalData/CDPP-AMDA/MAVEN/EUV/mvn-euv-mod.xml
@@ -17,7 +17,7 @@
          <Acknowledgement>  Principal Investigator : Frank Eparvier, LASP, Colorado          
          </Acknowledgement>
          <Contact>        
-            <PersonID>spase://CNES/Person/Frank.Eparvier</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Frank.Eparvier</PersonID>
             <Role>PrincipalInvestigator</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/MAVEN/Ephemeris/maven-orb-cruise.xml b/NumericalData/CDPP-AMDA/MAVEN/Ephemeris/maven-orb-cruise.xml
index 0c7824e..e993771 100644
--- a/NumericalData/CDPP-AMDA/MAVEN/Ephemeris/maven-orb-cruise.xml
+++ b/NumericalData/CDPP-AMDA/MAVEN/Ephemeris/maven-orb-cruise.xml
@@ -11,11 +11,11 @@
          <Acknowledgement>            
          </Acknowledgement>
         <Contact>       
-        <PersonID>spase://CNES/Person/NAIF</PersonID> 
+        <PersonID>spase://CNES/Person/CDPP-AMDA/NAIF</PersonID> 
         <Role>PrincipalInvestigator</Role>
       </Contact>
       <Contact>       
-        <PersonID>spase://CNES/Person/Elena.Budnik</PersonID> 
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Elena.Budnik</PersonID> 
         <Role>TechnicalContact</Role>
       </Contact>
           <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/MAVEN/Ephemeris/maven-orb-marsobs.xml b/NumericalData/CDPP-AMDA/MAVEN/Ephemeris/maven-orb-marsobs.xml
index 8179a6e..1ba0e94 100644
--- a/NumericalData/CDPP-AMDA/MAVEN/Ephemeris/maven-orb-marsobs.xml
+++ b/NumericalData/CDPP-AMDA/MAVEN/Ephemeris/maven-orb-marsobs.xml
@@ -12,11 +12,11 @@
          <Acknowledgement>            
          </Acknowledgement>
           <Contact>       
-        <PersonID>spase://CNES/Person/NAIF</PersonID> 
+        <PersonID>spase://CNES/Person/CDPP-AMDA/NAIF</PersonID> 
         <Role>PrincipalInvestigator</Role>
       </Contact>
       <Contact>       
-        <PersonID>spase://CNES/Person/Elena.Budnik</PersonID> 
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Elena.Budnik</PersonID> 
         <Role>TechnicalContact</Role>
       </Contact> 
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/MAVEN/LPW/mav-lpw-kp.xml b/NumericalData/CDPP-AMDA/MAVEN/LPW/mav-lpw-kp.xml
index 312b50b..97a3d6c 100644
--- a/NumericalData/CDPP-AMDA/MAVEN/LPW/mav-lpw-kp.xml
+++ b/NumericalData/CDPP-AMDA/MAVEN/LPW/mav-lpw-kp.xml
@@ -24,11 +24,11 @@
             <Role>PrincipalInvestigator</Role>           
          </Contact>
          <Contact>        
-            <PersonID>spase://CNES/Person/Laila.Andersson</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Laila.Andersson</PersonID>
             <Role>DataProducer</Role>           
          </Contact> 
          <Contact>        
-            <PersonID>spase://CNES/Person/P.Dunn</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/P.Dunn</PersonID>
             <Role>DataProducer</Role>
          </Contact>
            <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/MAVEN/LPW/mvn-lpw-scpot.xml b/NumericalData/CDPP-AMDA/MAVEN/LPW/mvn-lpw-scpot.xml
index 3583f8a..161ed1e 100644
--- a/NumericalData/CDPP-AMDA/MAVEN/LPW/mvn-lpw-scpot.xml
+++ b/NumericalData/CDPP-AMDA/MAVEN/LPW/mvn-lpw-scpot.xml
@@ -15,7 +15,7 @@
             <Role>PrincipalInvestigator</Role>           
          </Contact>
          <Contact>        
-            <PersonID>spase://CNES/Person/Laila.Andersson</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Laila.Andersson</PersonID>
             <Role>DataProducer</Role>           
          </Contact>
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/MAVEN/LPW/mvn-lpw-wn.xml b/NumericalData/CDPP-AMDA/MAVEN/LPW/mvn-lpw-wn.xml
index aae7e62..fda9fb9 100644
--- a/NumericalData/CDPP-AMDA/MAVEN/LPW/mvn-lpw-wn.xml
+++ b/NumericalData/CDPP-AMDA/MAVEN/LPW/mvn-lpw-wn.xml
@@ -17,7 +17,7 @@
             <Role>PrincipalInvestigator</Role>           
          </Contact>
          <Contact>        
-            <PersonID>spase://CNES/Person/Laila.Andersson</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Laila.Andersson</PersonID>
             <Role>DataProducer</Role>           
          </Contact>
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/MAVEN/MAG/mav-mag-all.xml b/NumericalData/CDPP-AMDA/MAVEN/MAG/mav-mag-all.xml
index 53056e3..3d0fdba 100644
--- a/NumericalData/CDPP-AMDA/MAVEN/MAG/mav-mag-all.xml
+++ b/NumericalData/CDPP-AMDA/MAVEN/MAG/mav-mag-all.xml
@@ -9,7 +9,7 @@
          <Description> averged over 1 sec from high resolution PDS data</Description>
          <Acknowledgement>Principal Investigator : John E.P. Connerney, NASA GODDARD, Greenbelt</Acknowledgement>
          <Contact>        
-            <PersonID>spase://CNES/Person/John.E.P.Connerney</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/John.E.P.Connerney</PersonID>
             <Role>PrincipalInvestigator</Role>            
          </Contact>   
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/MAVEN/MAG/mav-mag-kp.xml b/NumericalData/CDPP-AMDA/MAVEN/MAG/mav-mag-kp.xml
index 48bdd7f..8154387 100644
--- a/NumericalData/CDPP-AMDA/MAVEN/MAG/mav-mag-kp.xml
+++ b/NumericalData/CDPP-AMDA/MAVEN/MAG/mav-mag-kp.xml
@@ -10,11 +10,11 @@
           The in situ key parameters contain 235 parameters selected by the instrument leads and other MAVEN scientists. These data consist of values derived from L2 data provided by the in situ instruments.</Description>
          <Acknowledgement>Principal Investigator : John E.P. Connerney, NASA GODDARD, Greenbelt</Acknowledgement>
          <Contact>        
-            <PersonID>spase://CNES/Person/John.E.P.Connerney</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/John.E.P.Connerney</PersonID>
             <Role>PrincipalInvestigator</Role>            
          </Contact>   
          <Contact>        
-            <PersonID>spase://CNES/Person/P.Dunn</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/P.Dunn</PersonID>
             <Role>DataProducer</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/MAVEN/Models/mav-morsch-model.xml b/NumericalData/CDPP-AMDA/MAVEN/Models/mav-morsch-model.xml
index fe0e2c7..9379849 100644
--- a/NumericalData/CDPP-AMDA/MAVEN/Models/mav-morsch-model.xml
+++ b/NumericalData/CDPP-AMDA/MAVEN/Models/mav-morsch-model.xml
@@ -11,11 +11,11 @@
          </Description>
          <Acknowledgement>TBD</Acknowledgement> 
          <Contact>
-               <PersonID>spase://CNES/Person/A.Morschhauser</PersonID>
+               <PersonID>spase://CNES/Person/CDPP-AMDA/A.Morschhauser</PersonID>
                <Role>PrincipalInvestigator</Role>
             </Contact>
             <Contact>
-               <PersonID>spase://CNES/Person/A.Beth</PersonID>
+               <PersonID>spase://CNES/Person/CDPP-AMDA/A.Beth</PersonID>
                <Role>TechnicalContact</Role>
             </Contact>        
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/MAVEN/NGIMS/mav-ngims-kp.xml b/NumericalData/CDPP-AMDA/MAVEN/NGIMS/mav-ngims-kp.xml
index 7a1513b..17d59f3 100644
--- a/NumericalData/CDPP-AMDA/MAVEN/NGIMS/mav-ngims-kp.xml
+++ b/NumericalData/CDPP-AMDA/MAVEN/NGIMS/mav-ngims-kp.xml
@@ -15,7 +15,7 @@
             <Role>PrincipalInvestigator</Role>
          </Contact>
          <Contact>        
-            <PersonID>spase://CNES/Person/P.Dunn</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/P.Dunn</PersonID>
             <Role>DataProducer</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/MAVEN/STATIC/mav-static-kp.xml b/NumericalData/CDPP-AMDA/MAVEN/STATIC/mav-static-kp.xml
index 786203f..244cc6d 100644
--- a/NumericalData/CDPP-AMDA/MAVEN/STATIC/mav-static-kp.xml
+++ b/NumericalData/CDPP-AMDA/MAVEN/STATIC/mav-static-kp.xml
@@ -26,7 +26,7 @@
             <Role>PrincipalInvestigator</Role>
          </Contact>
          <Contact>        
-            <PersonID>spase://CNES/Person/P.Dunn</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/P.Dunn</PersonID>
             <Role>DataProducer</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/MAVEN/SWEA/mav-swea-kp.xml b/NumericalData/CDPP-AMDA/MAVEN/SWEA/mav-swea-kp.xml
index 9e64b18..a8456c0 100644
--- a/NumericalData/CDPP-AMDA/MAVEN/SWEA/mav-swea-kp.xml
+++ b/NumericalData/CDPP-AMDA/MAVEN/SWEA/mav-swea-kp.xml
@@ -11,11 +11,11 @@
             The in situ key parameters contain 235 parameters selected by the instrument leads and other MAVEN scientists. These data consist of values derived from L2 data provided by the in situ instruments.</Description>
          <Acknowledgement>&gt;Principal Investigator : David L. Mitchell, SSL, Berkeley</Acknowledgement> 
          <Contact>        
-            <PersonID>spase://CNES/Person/David.L.Mitchell</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/David.L.Mitchell</PersonID>
             <Role>PrincipalInvestigator</Role>
          </Contact>        
          <Contact>        
-            <PersonID>spase://CNES/Person/P.Dunn</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/P.Dunn</PersonID>
             <Role>DataProducer</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/MAVEN/SWEA/mavpds-swea-svyspec.xml b/NumericalData/CDPP-AMDA/MAVEN/SWEA/mavpds-swea-svyspec.xml
index e6a0648..c993896 100644
--- a/NumericalData/CDPP-AMDA/MAVEN/SWEA/mavpds-swea-svyspec.xml
+++ b/NumericalData/CDPP-AMDA/MAVEN/SWEA/mavpds-swea-svyspec.xml
@@ -12,7 +12,7 @@
          </Description>
          <Acknowledgement>Principal Investigator : David L. Mitchell, SSL, Berkeley</Acknowledgement>
          <Contact>        
-            <PersonID>spase://CNES/Person/David.L.Mitchell</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/David.L.Mitchell</PersonID>
             <Role>PrincipalInvestigator</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/MAVEN/SWIA/mav-swia-kp.xml b/NumericalData/CDPP-AMDA/MAVEN/SWIA/mav-swia-kp.xml
index cb973f5..fae3948 100644
--- a/NumericalData/CDPP-AMDA/MAVEN/SWIA/mav-swia-kp.xml
+++ b/NumericalData/CDPP-AMDA/MAVEN/SWIA/mav-swia-kp.xml
@@ -11,11 +11,11 @@
           The in situ key parameters contain 235 parameters selected by the instrument leads and other MAVEN scientists. These data consist of values derived from L2 data provided by the in situ instruments.</Description>
          <Acknowledgement> Principal Investigator : Jasper Halekas, Univ. Iowa, Iowa City</Acknowledgement>
          <Contact>        
-            <PersonID>spase://CNES/Person/Jasper.S.Halekas</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Jasper.S.Halekas</PersonID>
             <Role>PrincipalInvestigator</Role>
          </Contact>
          <Contact>        
-            <PersonID>spase://CNES/Person/P.Dunn</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/P.Dunn</PersonID>
             <Role>DataProducer</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/MAVEN/SWIA/mavpds-swia-momboard.xml b/NumericalData/CDPP-AMDA/MAVEN/SWIA/mavpds-swia-momboard.xml
index 9d2c0e5..0172e86 100644
--- a/NumericalData/CDPP-AMDA/MAVEN/SWIA/mavpds-swia-momboard.xml
+++ b/NumericalData/CDPP-AMDA/MAVEN/SWIA/mavpds-swia-momboard.xml
@@ -15,7 +15,7 @@
          <Acknowledgement> Principal Investigator : Jasper Halekas, Univ. Iowa, Iowa City            
          </Acknowledgement>
          <Contact>        
-            <PersonID>spase://CNES/Person/Jasper.S.Halekas</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Jasper.S.Halekas</PersonID>
             <Role>PrincipalInvestigator</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/MAVEN/SWIA/mavpds-swia-specboard.xml b/NumericalData/CDPP-AMDA/MAVEN/SWIA/mavpds-swia-specboard.xml
index 82197ac..10800ee 100644
--- a/NumericalData/CDPP-AMDA/MAVEN/SWIA/mavpds-swia-specboard.xml
+++ b/NumericalData/CDPP-AMDA/MAVEN/SWIA/mavpds-swia-specboard.xml
@@ -12,7 +12,7 @@
          <Acknowledgement>  Principal Investigator : Jasper Halekas, Univ. Iowa, Iowa City          
          </Acknowledgement>
          <Contact>        
-            <PersonID>spase://CNES/Person/Jasper.S.Halekas</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Jasper.S.Halekas</PersonID>
             <Role>PrincipalInvestigator</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/MESSENGER/EPS/mess-eps-pa.xml b/NumericalData/CDPP-AMDA/MESSENGER/EPS/mess-eps-pa.xml
index ca5e34c..74790db 100644
--- a/NumericalData/CDPP-AMDA/MESSENGER/EPS/mess-eps-pa.xml
+++ b/NumericalData/CDPP-AMDA/MESSENGER/EPS/mess-eps-pa.xml
@@ -12,7 +12,7 @@
                 Please note that the D03 detector on EPS has a very high background and is 
                 not useable for any science data product.</Description>
             <Contact>
-                <PersonID>spase://CNES/Person/George.Ho</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/George.Ho</PersonID>
                 <Role>DataProducer</Role>      
           </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/MESSENGER/EPS/mess-eps-spec.xml b/NumericalData/CDPP-AMDA/MESSENGER/EPS/mess-eps-spec.xml
index 2b16179..94a0b36 100644
--- a/NumericalData/CDPP-AMDA/MESSENGER/EPS/mess-eps-spec.xml
+++ b/NumericalData/CDPP-AMDA/MESSENGER/EPS/mess-eps-spec.xml
@@ -12,7 +12,7 @@
                 Please note that the D03 detector on EPS has a very high background and is 
                 not useable for any science data product.</Description>
             <Contact>
-                <PersonID>spase://CNES/Person/George.Ho</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/George.Ho</PersonID>
                 <Role>DataProducer</Role>      
           </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/MESSENGER/FIPS/mes-fips-scan.xml b/NumericalData/CDPP-AMDA/MESSENGER/FIPS/mes-fips-scan.xml
index 9eef374..1ce16a4 100644
--- a/NumericalData/CDPP-AMDA/MESSENGER/FIPS/mes-fips-scan.xml
+++ b/NumericalData/CDPP-AMDA/MESSENGER/FIPS/mes-fips-scan.xml
@@ -9,7 +9,7 @@
             <Description>Fast Imaging Plasma Spectrometer (FIPS) data (spectrogram). 
                 FIPS Scan CDR contains FIPS differential intensity spectra at each Deflection System High Voltage (DSHV) step in a scan.</Description>
          <Contact>
-          <PersonID>spase://CNES/Person/George.Ho</PersonID>
+          <PersonID>spase://CNES/Person/CDPP-AMDA/George.Ho</PersonID>
          <Role>DataProducer</Role>      
       </Contact> 
         </ResourceHeader>
diff --git a/NumericalData/CDPP-AMDA/MESSENGER/FIPS/mess-fips-espec.xml b/NumericalData/CDPP-AMDA/MESSENGER/FIPS/mess-fips-espec.xml
index 8c6149f..d5ab29f 100644
--- a/NumericalData/CDPP-AMDA/MESSENGER/FIPS/mess-fips-espec.xml
+++ b/NumericalData/CDPP-AMDA/MESSENGER/FIPS/mess-fips-espec.xml
@@ -11,7 +11,7 @@
       each of the 64 E/q values (0.046 - 13.3 keV/e) for selected major
       ion species during selected time periods.</Description>
          <Contact>
-          <PersonID>spase://CNES/Person/George.Ho</PersonID>
+          <PersonID>spase://CNES/Person/CDPP-AMDA/George.Ho</PersonID>
          <Role>DataProducer</Role>      
       </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/MESSENGER/FIPS/mess-fips-nobs.xml b/NumericalData/CDPP-AMDA/MESSENGER/FIPS/mess-fips-nobs.xml
index 23bc4f9..beec224 100644
--- a/NumericalData/CDPP-AMDA/MESSENGER/FIPS/mess-fips-nobs.xml
+++ b/NumericalData/CDPP-AMDA/MESSENGER/FIPS/mess-fips-nobs.xml
@@ -9,7 +9,7 @@
             <ReleaseDate>2017-01-16T14:08:29Z</ReleaseDate>
             <Description>This data set contains FIPS  observed densities ( FIPS_NOBS ) for selected ion species.</Description>
          <Contact>
-          <PersonID>spase://CNES/Person/George.Ho</PersonID>
+          <PersonID>spase://CNES/Person/CDPP-AMDA/George.Ho</PersonID>
          <Role>DataProducer</Role>      
       </Contact> 
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/MESSENGER/FIPS/mess-fips-ntp.xml b/NumericalData/CDPP-AMDA/MESSENGER/FIPS/mess-fips-ntp.xml
index fca7ef6..74612bd 100644
--- a/NumericalData/CDPP-AMDA/MESSENGER/FIPS/mess-fips-ntp.xml
+++ b/NumericalData/CDPP-AMDA/MESSENGER/FIPS/mess-fips-ntp.xml
@@ -20,7 +20,7 @@ In this version of the dataset, many of these products are provided
       by Slavin et al. [Science, 2010] is used.            
             </Description>
          <Contact>
-          <PersonID>spase://CNES/Person/George.Ho</PersonID>
+          <PersonID>spase://CNES/Person/CDPP-AMDA/George.Ho</PersonID>
          <Role>DataProducer</Role>      
       </Contact>
            <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/MESSENGER/ephemeris/mes-orb-orb.xml b/NumericalData/CDPP-AMDA/MESSENGER/ephemeris/mes-orb-orb.xml
index 73cd145..f641593 100644
--- a/NumericalData/CDPP-AMDA/MESSENGER/ephemeris/mes-orb-orb.xml
+++ b/NumericalData/CDPP-AMDA/MESSENGER/ephemeris/mes-orb-orb.xml
@@ -8,11 +8,11 @@
             <ReleaseDate>2017-01-11T14:40:00.000Z</ReleaseDate>
             <Description>MESSENGER orbital data during orbital phase at Mercury. Orbital data are calculated based on SPICE kernels</Description>
             <Contact>
-                <PersonID>spase://CNES/Person/NAIF</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/NAIF</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/Elena.Budnik</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Elena.Budnik</PersonID>
                 <Role>TechnicalContact</Role>
             </Contact>
         </ResourceHeader>
diff --git a/NumericalData/CDPP-AMDA/MEX/ELS/mex-els-all.xml b/NumericalData/CDPP-AMDA/MEX/ELS/mex-els-all.xml
index 4ef5b43..330f93d 100644
--- a/NumericalData/CDPP-AMDA/MEX/ELS/mex-els-all.xml
+++ b/NumericalData/CDPP-AMDA/MEX/ELS/mex-els-all.xml
@@ -14,11 +14,11 @@ Institute of Space Physics, PI, and the European Space Agency</Acknowledgement>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/Rudy.Frahm</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Rudy.Frahm</PersonID>
                 <Role>GeneralContact</Role>
             </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/Elena.Budnik</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Elena.Budnik</PersonID>
                 <Role>TechnicalContact</Role>
             </Contact>           
         </ResourceHeader>
diff --git a/NumericalData/CDPP-AMDA/MEX/IMA/mex-ima-bg.xml b/NumericalData/CDPP-AMDA/MEX/IMA/mex-ima-bg.xml
index 3fa3e2f..562f923 100644
--- a/NumericalData/CDPP-AMDA/MEX/IMA/mex-ima-bg.xml
+++ b/NumericalData/CDPP-AMDA/MEX/IMA/mex-ima-bg.xml
@@ -8,7 +8,7 @@
             <ReleaseDate>2020-08-15T09:42:00</ReleaseDate>
             <Description>Mex IMA instrument background</Description>
             <Contact>
-                <PersonID>spase://CNES/Person/Yoshifumi.Futaana</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Yoshifumi.Futaana</PersonID>
                 <Role>GeneralContact</Role>
             </Contact>
         </ResourceHeader>
diff --git a/NumericalData/CDPP-AMDA/MEX/IMA/mex-ima-extra.xml b/NumericalData/CDPP-AMDA/MEX/IMA/mex-ima-extra.xml
index 00d01a1..c27e28a 100644
--- a/NumericalData/CDPP-AMDA/MEX/IMA/mex-ima-extra.xml
+++ b/NumericalData/CDPP-AMDA/MEX/IMA/mex-ima-extra.xml
@@ -9,11 +9,11 @@
             <Description>Mars Express (MEX) ASPERA-3 Ion Mass Analyzer (IMA) data (spectrograms)
                 Data from Andrei Fedorov (IRAP)</Description>
              <Contact>
-                <PersonID>spase://CNES/Person/Andrei.Fedorov</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Andrei.Fedorov</PersonID>
                 <Role>GeneralContact</Role>
             </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/Elena.Budnik</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Elena.Budnik</PersonID>
                 <Role>GeneralContact</Role>
             </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/MEX/IMA/mex-ima-param.xml b/NumericalData/CDPP-AMDA/MEX/IMA/mex-ima-param.xml
index f32eb10..3e4df7c 100644
--- a/NumericalData/CDPP-AMDA/MEX/IMA/mex-ima-param.xml
+++ b/NumericalData/CDPP-AMDA/MEX/IMA/mex-ima-param.xml
@@ -8,11 +8,11 @@
             <ReleaseDate>2017-02-15T09:42:00</ReleaseDate>
             <Description>IMA ion moments are calculated in IRAP using Andrei Fedorov procedure</Description>
             <Contact>
-                <PersonID>spase://CNES/Person/Andrei.Fedorov</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Andrei.Fedorov</PersonID>
                 <Role>GeneralContact</Role>
             </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/Elena.Budnik</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Elena.Budnik</PersonID>
                 <Role>TechnicalContact</Role>
             </Contact>
         </ResourceHeader>
diff --git a/NumericalData/CDPP-AMDA/MEX/IMA/mex-ima-sw.xml b/NumericalData/CDPP-AMDA/MEX/IMA/mex-ima-sw.xml
index 54758a1..51e757e 100644
--- a/NumericalData/CDPP-AMDA/MEX/IMA/mex-ima-sw.xml
+++ b/NumericalData/CDPP-AMDA/MEX/IMA/mex-ima-sw.xml
@@ -9,11 +9,11 @@
             <ReleaseDate>2017-02-15T09:42:00</ReleaseDate>
             <Description>Mex IMA protons density and velocity in SW is a subset of IMA ion moments dataset on applying an orbital restrictions. IMA ion moments are calculated in IRAP using Andrei Fedorov procedure</Description>
             <Contact>
-                <PersonID>spase://CNES/Person/Andrei.Fedorov</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Andrei.Fedorov</PersonID>
                 <Role>GeneralContact</Role>
             </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/Elena.Budnik</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Elena.Budnik</PersonID>
                 <Role>TechnicalContact</Role>
             </Contact>
         </ResourceHeader>
diff --git a/NumericalData/CDPP-AMDA/MEX/MARSIS/mex-marsis-ele.xml b/NumericalData/CDPP-AMDA/MEX/MARSIS/mex-marsis-ele.xml
index 61c2c74..92969d9 100644
--- a/NumericalData/CDPP-AMDA/MEX/MARSIS/mex-marsis-ele.xml
+++ b/NumericalData/CDPP-AMDA/MEX/MARSIS/mex-marsis-ele.xml
@@ -22,11 +22,11 @@ Then the optimization is done by using the following constraints:
  * A constraint on the SNR. The signal amplitude must be maximal after correction.
 </Description>
             <Contact> 
-                <PersonID>spase://CNES/Person/W.Kofman</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/W.Kofman</PersonID>
                 <Role>DataProducer</Role>
             </Contact>
             <Contact> 
-                <PersonID>spase://CNES/Person/C.Grima</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/C.Grima</PersonID>
                 <Role>DataProducer</Role>
             </Contact> 
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/MEX/Models/mex-morsch-model.xml b/NumericalData/CDPP-AMDA/MEX/Models/mex-morsch-model.xml
index 299894a..67c8608 100644
--- a/NumericalData/CDPP-AMDA/MEX/Models/mex-morsch-model.xml
+++ b/NumericalData/CDPP-AMDA/MEX/Models/mex-morsch-model.xml
@@ -11,11 +11,11 @@
          </Description>
          <Acknowledgement>TBD</Acknowledgement> 
          <Contact>
-               <PersonID>spase://CNES/Person/A.Morschhauser</PersonID>
+               <PersonID>spase://CNES/Person/CDPP-AMDA/A.Morschhauser</PersonID>
                <Role>PrincipalInvestigator</Role>
             </Contact>
             <Contact>
-               <PersonID>spase://CNES/Person/A.Beth</PersonID>
+               <PersonID>spase://CNES/Person/CDPP-AMDA/A.Beth</PersonID>
                <Role>TechnicalContact</Role>
             </Contact>        
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/MEX/ephemeris/mex-orb-mars.xml b/NumericalData/CDPP-AMDA/MEX/ephemeris/mex-orb-mars.xml
index 995880e..eb73f3f 100644
--- a/NumericalData/CDPP-AMDA/MEX/ephemeris/mex-orb-mars.xml
+++ b/NumericalData/CDPP-AMDA/MEX/ephemeris/mex-orb-mars.xml
@@ -8,7 +8,7 @@
             <ReleaseDate>2017-01-15T10:17:29Z</ReleaseDate>
             <Description>Orbital data are calculated based on SPICE kernels at IRAP</Description>           
             <Contact>
-                <PersonID>spase://CNES/Person/Elena.Budnik</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Elena.Budnik</PersonID>
                 <Role>TechnicalContact</Role>
             </Contact>
            <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/MGS/ER/mgs-er-omni.xml b/NumericalData/CDPP-AMDA/MGS/ER/mgs-er-omni.xml
index 3400505..91bdd49 100644
--- a/NumericalData/CDPP-AMDA/MGS/ER/mgs-er-omni.xml
+++ b/NumericalData/CDPP-AMDA/MGS/ER/mgs-er-omni.xml
@@ -8,7 +8,7 @@
       <ReleaseDate>2017-10-15T15:19:00Z</ReleaseDate>
       <Description>Mars Global Surveyor Electron Reflectometer (ER) data</Description>
       <Contact>
-        <PersonID>spase://CNES/Person/John.E.P.Connerney</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/John.E.P.Connerney</PersonID>
         <Role>GeneralContact</Role>
       </Contact>
     </ResourceHeader>
diff --git a/NumericalData/CDPP-AMDA/MGS/Ephemeris/mgs-orb-all.xml b/NumericalData/CDPP-AMDA/MGS/Ephemeris/mgs-orb-all.xml
index 91f1138..259e8d1 100644
--- a/NumericalData/CDPP-AMDA/MGS/Ephemeris/mgs-orb-all.xml
+++ b/NumericalData/CDPP-AMDA/MGS/Ephemeris/mgs-orb-all.xml
@@ -8,11 +8,11 @@
       <ReleaseDate>2015-10-22T10:19:00Z</ReleaseDate>
       <Description>Orbital data are calculated based on SPICE kernels</Description>
       <Contact>       
-        <PersonID>spase://CNES/Person/NAIF</PersonID> 
+        <PersonID>spase://CNES/Person/CDPP-AMDA/NAIF</PersonID> 
         <Role>PrincipalInvestigator</Role>
       </Contact>
       <Contact>       
-        <PersonID>spase://CNES/Person/Elena.Budnik</PersonID> 
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Elena.Budnik</PersonID> 
         <Role>TechnicalContact</Role>
       </Contact> 
       <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/MGS/MAG/mgs-mag-mso.xml b/NumericalData/CDPP-AMDA/MGS/MAG/mgs-mag-mso.xml
index bef16ee..8f80c0d 100644
--- a/NumericalData/CDPP-AMDA/MGS/MAG/mgs-mag-mso.xml
+++ b/NumericalData/CDPP-AMDA/MGS/MAG/mgs-mag-mso.xml
@@ -8,7 +8,7 @@
       <ReleaseDate>2015-10-15T15:39:00Z</ReleaseDate>
       <Description/>
       <Contact>
-        <PersonID>spase://CNES/Person/John.E.P.Connerney</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/John.E.P.Connerney</PersonID>
         <Role>GeneralContact</Role>
       </Contact>
     </ResourceHeader>
diff --git a/NumericalData/CDPP-AMDA/MGS/Models/mgs-morsch-model.xml b/NumericalData/CDPP-AMDA/MGS/Models/mgs-morsch-model.xml
index 969848c..9815cb6 100644
--- a/NumericalData/CDPP-AMDA/MGS/Models/mgs-morsch-model.xml
+++ b/NumericalData/CDPP-AMDA/MGS/Models/mgs-morsch-model.xml
@@ -11,11 +11,11 @@
          </Description>
          <Acknowledgement>TBD</Acknowledgement> 
          <Contact>
-               <PersonID>spase://CNES/Person/A.Morschhauser</PersonID>
+               <PersonID>spase://CNES/Person/CDPP-AMDA/A.Morschhauser</PersonID>
                <Role>PrincipalInvestigator</Role>
             </Contact>
             <Contact>
-               <PersonID>spase://CNES/Person/A.Beth</PersonID>
+               <PersonID>spase://CNES/Person/CDPP-AMDA/A.Beth</PersonID>
                <Role>TechnicalContact</Role>
             </Contact>        
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/MGS/Proxy/mgs-proxy-drap.xml b/NumericalData/CDPP-AMDA/MGS/Proxy/mgs-proxy-drap.xml
index e78bbc6..13e064a 100644
--- a/NumericalData/CDPP-AMDA/MGS/Proxy/mgs-proxy-drap.xml
+++ b/NumericalData/CDPP-AMDA/MGS/Proxy/mgs-proxy-drap.xml
@@ -11,7 +11,7 @@
 We have tried several other methods of determining draping direction - all have strengths and weaknesses. In the future we may include the results of some of these other methods on this page</Description> 
          <Acknowledgement/>
          <Contact>        
-            <PersonID>spase://CNES/Person/David.Brain</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/David.Brain</PersonID>
             <Role>TechnicalContact</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/MGS/Proxy/mgs-proxy-euv.xml b/NumericalData/CDPP-AMDA/MGS/Proxy/mgs-proxy-euv.xml
index 1bf05e5..7737c98 100644
--- a/NumericalData/CDPP-AMDA/MGS/Proxy/mgs-proxy-euv.xml
+++ b/NumericalData/CDPP-AMDA/MGS/Proxy/mgs-proxy-euv.xml
@@ -12,7 +12,7 @@
          <Acknowledgement>            
          </Acknowledgement>
          <Contact>        
-            <PersonID>spase://CNES/Person/David.Brain</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/David.Brain</PersonID>
             <Role>TechnicalContact</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/MGS/Proxy/mgs-proxy-subsol.xml b/NumericalData/CDPP-AMDA/MGS/Proxy/mgs-proxy-subsol.xml
index 8ae3a3f..525857d 100644
--- a/NumericalData/CDPP-AMDA/MGS/Proxy/mgs-proxy-subsol.xml
+++ b/NumericalData/CDPP-AMDA/MGS/Proxy/mgs-proxy-subsol.xml
@@ -17,7 +17,7 @@
          <Acknowledgement>            
          </Acknowledgement>
          <Contact>        
-            <PersonID>spase://CNES/Person/David.Brain</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/David.Brain</PersonID>
             <Role>TechnicalContact</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/MMS/MMS1/EDP/mms1-dce-brst.xml b/NumericalData/CDPP-AMDA/MMS/MMS1/EDP/mms1-dce-brst.xml
index 2cacf51..c4fdda8 100644
--- a/NumericalData/CDPP-AMDA/MMS/MMS1/EDP/mms1-dce-brst.xml
+++ b/NumericalData/CDPP-AMDA/MMS/MMS1/EDP/mms1-dce-brst.xml
@@ -9,15 +9,15 @@
             <ReleaseDate>2017-01-16T11:50:00</ReleaseDate>
             <Description></Description>
             <Contact>
-                <PersonID>spase://CNES/Person/James.L.Burch</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/James.L.Burch</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>  
             <Contact>
-                <PersonID>spase://CNES/Person/Robert.E.Ergun</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Robert.E.Ergun</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/P.Lindqvist</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/P.Lindqvist</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>    
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/MMS/MMS1/EDP/mms1-edp-dce.xml b/NumericalData/CDPP-AMDA/MMS/MMS1/EDP/mms1-edp-dce.xml
index 042c034..48e85a9 100644
--- a/NumericalData/CDPP-AMDA/MMS/MMS1/EDP/mms1-edp-dce.xml
+++ b/NumericalData/CDPP-AMDA/MMS/MMS1/EDP/mms1-edp-dce.xml
@@ -9,15 +9,15 @@
             <ReleaseDate>2017-01-16T11:50:00</ReleaseDate>
             <Description></Description>         
             <Contact>
-                <PersonID>spase://CNES/Person/James.L.Burch</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/James.L.Burch</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>  
             <Contact>
-                <PersonID>spase://CNES/Person/Robert.E.Ergun</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Robert.E.Ergun</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/P.Lindqvist</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/P.Lindqvist</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>    
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/MMS/MMS1/EDP/mms1-edp-hfesp.xml b/NumericalData/CDPP-AMDA/MMS/MMS1/EDP/mms1-edp-hfesp.xml
index 5744463..59842b3 100644
--- a/NumericalData/CDPP-AMDA/MMS/MMS1/EDP/mms1-edp-hfesp.xml
+++ b/NumericalData/CDPP-AMDA/MMS/MMS1/EDP/mms1-edp-hfesp.xml
@@ -9,15 +9,15 @@
             <ReleaseDate>2017-01-16T11:50:00</ReleaseDate>
             <Description></Description>         
             <Contact>
-                <PersonID>spase://CNES/Person/James.L.Burch</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/James.L.Burch</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>  
             <Contact>
-                <PersonID>spase://CNES/Person/Robert.E.Ergun</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Robert.E.Ergun</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/P.Lindqvist</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/P.Lindqvist</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>    
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/MMS/MMS1/EDP/mms1-edp-scpot.xml b/NumericalData/CDPP-AMDA/MMS/MMS1/EDP/mms1-edp-scpot.xml
index 1ae9c39..ff905af 100644
--- a/NumericalData/CDPP-AMDA/MMS/MMS1/EDP/mms1-edp-scpot.xml
+++ b/NumericalData/CDPP-AMDA/MMS/MMS1/EDP/mms1-edp-scpot.xml
@@ -9,15 +9,15 @@
             <ReleaseDate>2017-01-16T11:50:00</ReleaseDate>
             <Description/>
             <Contact>
-                <PersonID>spase://CNES/Person/James.L.Burch</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/James.L.Burch</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/Robert.E.Ergun</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Robert.E.Ergun</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/P.Lindqvist</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/P.Lindqvist</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/MMS/MMS1/Ephemeris/mms1-orb-t89d.xml b/NumericalData/CDPP-AMDA/MMS/MMS1/Ephemeris/mms1-orb-t89d.xml
index e3e58df..9052cc2 100644
--- a/NumericalData/CDPP-AMDA/MMS/MMS1/Ephemeris/mms1-orb-t89d.xml
+++ b/NumericalData/CDPP-AMDA/MMS/MMS1/Ephemeris/mms1-orb-t89d.xml
@@ -8,11 +8,11 @@
             <ReleaseDate>2017-01-16T11:50:00</ReleaseDate>
             <Description>MMS1 position</Description>         
            <Contact>
-               <PersonID>spase://CNES/Person/M.G.Henderson</PersonID>
+               <PersonID>spase://CNES/Person/CDPP-AMDA/M.G.Henderson</PersonID>
                <Role>PrincipalInvestigator</Role>
            </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/S.K.Morley</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/S.K.Morley</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/MMS/MMS1/FGM/mms1-fgm-brst.xml b/NumericalData/CDPP-AMDA/MMS/MMS1/FGM/mms1-fgm-brst.xml
index 3d452fd..a8f8d8a 100644
--- a/NumericalData/CDPP-AMDA/MMS/MMS1/FGM/mms1-fgm-brst.xml
+++ b/NumericalData/CDPP-AMDA/MMS/MMS1/FGM/mms1-fgm-brst.xml
@@ -15,7 +15,7 @@
                 0.15 nT along the spin-axis and 0.2 nT in total magnitude
             </Description>         
             <Contact>
-                <PersonID>spase://CNES/Person/James.L.Burch</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/James.L.Burch</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>  
             <Contact>
@@ -23,7 +23,7 @@
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/W.Magnus</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/W.Magnus</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact> 
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/MMS/MMS1/FGM/mms1-fgm-srvy.xml b/NumericalData/CDPP-AMDA/MMS/MMS1/FGM/mms1-fgm-srvy.xml
index 76d6a2c..4d156fc 100644
--- a/NumericalData/CDPP-AMDA/MMS/MMS1/FGM/mms1-fgm-srvy.xml
+++ b/NumericalData/CDPP-AMDA/MMS/MMS1/FGM/mms1-fgm-srvy.xml
@@ -15,7 +15,7 @@
                 0.15 nT along the spin-axis and 0.2 nT in total magnitude
             </Description>         
             <Contact>
-                <PersonID>spase://CNES/Person/James.L.Burch</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/James.L.Burch</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>  
             <Contact>
@@ -23,7 +23,7 @@
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/W.Magnus</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/W.Magnus</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact> 
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/MMS/MMS1/FPI/mms1-fpi-brst.current.xml b/NumericalData/CDPP-AMDA/MMS/MMS1/FPI/mms1-fpi-brst.current.xml
index 0e2dfb9..5f75104 100644
--- a/NumericalData/CDPP-AMDA/MMS/MMS1/FPI/mms1-fpi-brst.current.xml
+++ b/NumericalData/CDPP-AMDA/MMS/MMS1/FPI/mms1-fpi-brst.current.xml
@@ -12,11 +12,11 @@
             Electric current: mms1_brst_jgse = 1.6e-10*(mms1_brst_desm_n+mms1_brst_dism_n)*0.5*(mms1_brst_dism_v-mms1_brst_desm_v)
             </Description>         
             <Contact>
-                <PersonID>spase://CNES/Person/James.L.Burch</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/James.L.Burch</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/B.Giles</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/B.Giles</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact> 
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/MMS/MMS1/FPI/mms1-fpi-brst.desm.xml b/NumericalData/CDPP-AMDA/MMS/MMS1/FPI/mms1-fpi-brst.desm.xml
index 3f4c5a2..ec7bf68 100644
--- a/NumericalData/CDPP-AMDA/MMS/MMS1/FPI/mms1-fpi-brst.desm.xml
+++ b/NumericalData/CDPP-AMDA/MMS/MMS1/FPI/mms1-fpi-brst.desm.xml
@@ -32,11 +32,11 @@ dicated time.
             * Bit-11 = compression pipeline error
             * Bit-12 = spintone calculation error (DBCS only)</Description>         
              <Contact>
-                 <PersonID>spase://CNES/Person/James.L.Burch</PersonID>
+                 <PersonID>spase://CNES/Person/CDPP-AMDA/James.L.Burch</PersonID>
                  <Role>PrincipalInvestigator</Role>
              </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/B.Giles</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/B.Giles</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact> 
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/MMS/MMS1/FPI/mms1-fpi-brst.dism.xml b/NumericalData/CDPP-AMDA/MMS/MMS1/FPI/mms1-fpi-brst.dism.xml
index 9eb25d6..68931c7 100644
--- a/NumericalData/CDPP-AMDA/MMS/MMS1/FPI/mms1-fpi-brst.dism.xml
+++ b/NumericalData/CDPP-AMDA/MMS/MMS1/FPI/mms1-fpi-brst.dism.xml
@@ -34,11 +34,11 @@ dicated time.
             * Bit-13 = significant (greater than 20%) penetrating radiation
             </Description>         
              <Contact>
-                 <PersonID>spase://CNES/Person/James.L.Burch</PersonID>
+                 <PersonID>spase://CNES/Person/CDPP-AMDA/James.L.Burch</PersonID>
                  <Role>PrincipalInvestigator</Role>
              </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/B.Giles</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/B.Giles</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact> 
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/MMS/MMS1/FPI/mms1-fpi-current.xml b/NumericalData/CDPP-AMDA/MMS/MMS1/FPI/mms1-fpi-current.xml
index 9ed76df..3486047 100644
--- a/NumericalData/CDPP-AMDA/MMS/MMS1/FPI/mms1-fpi-current.xml
+++ b/NumericalData/CDPP-AMDA/MMS/MMS1/FPI/mms1-fpi-current.xml
@@ -12,11 +12,11 @@
             Electric current: mms1_fast_jgse = 1.6e-10*(mms1_des_ne+mms1_dis_ni)*0.5*(mms1_dis_vgse-mms1_des_vgse)
             </Description>         
             <Contact>
-                <PersonID>spase://CNES/Person/James.L.Burch</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/James.L.Burch</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/B.Giles</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/B.Giles</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact> 
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/MMS/MMS1/FPI/mms1-fpi-desmoms.xml b/NumericalData/CDPP-AMDA/MMS/MMS1/FPI/mms1-fpi-desmoms.xml
index 3ab1ebe..2eefa75 100644
--- a/NumericalData/CDPP-AMDA/MMS/MMS1/FPI/mms1-fpi-desmoms.xml
+++ b/NumericalData/CDPP-AMDA/MMS/MMS1/FPI/mms1-fpi-desmoms.xml
@@ -16,11 +16,11 @@ the current Mission Phase.  Data are taken at burst (30/150 ms for DES/DIS) reso
 product of this sort, plus time-stamps and other annotation characterizing the state of the instrument system at the in
 dicated time.</Description>         
              <Contact>
-                 <PersonID>spase://CNES/Person/James.L.Burch</PersonID>
+                 <PersonID>spase://CNES/Person/CDPP-AMDA/James.L.Burch</PersonID>
                  <Role>PrincipalInvestigator</Role>
              </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/B.Giles</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/B.Giles</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact> 
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/MMS/MMS1/FPI/mms1-fpi-dismoms.xml b/NumericalData/CDPP-AMDA/MMS/MMS1/FPI/mms1-fpi-dismoms.xml
index 789883f..862a5c6 100644
--- a/NumericalData/CDPP-AMDA/MMS/MMS1/FPI/mms1-fpi-dismoms.xml
+++ b/NumericalData/CDPP-AMDA/MMS/MMS1/FPI/mms1-fpi-dismoms.xml
@@ -16,11 +16,11 @@ the current Mission Phase.  Data are taken at burst (30/150 ms for DES/DIS) reso
 product of this sort, plus time-stamps and other annotation characterizing the state of the instrument system at the in
 dicated time.</Description>         
              <Contact>
-                 <PersonID>spase://CNES/Person/James.L.Burch</PersonID>
+                 <PersonID>spase://CNES/Person/CDPP-AMDA/James.L.Burch</PersonID>
                  <Role>PrincipalInvestigator</Role>
              </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/B.Giles</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/B.Giles</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact> 
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/MMS/MMS1/HPCA/mms1-hpca-brst.xml b/NumericalData/CDPP-AMDA/MMS/MMS1/HPCA/mms1-hpca-brst.xml
index 7a47223..ab3e2c0 100644
--- a/NumericalData/CDPP-AMDA/MMS/MMS1/HPCA/mms1-hpca-brst.xml
+++ b/NumericalData/CDPP-AMDA/MMS/MMS1/HPCA/mms1-hpca-brst.xml
@@ -9,11 +9,11 @@
             <ReleaseDate>2020-10-02T11:50:00</ReleaseDate>
             <Description> </Description>         
             <Contact>
-                <PersonID>spase://CNES/Person/James.L.Burch</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/James.L.Burch</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/S.Fuselier</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/S.Fuselier</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/MMS/MMS1/HPCA/mms1-hpca-moms.xml b/NumericalData/CDPP-AMDA/MMS/MMS1/HPCA/mms1-hpca-moms.xml
index ce56c64..6de6780 100644
--- a/NumericalData/CDPP-AMDA/MMS/MMS1/HPCA/mms1-hpca-moms.xml
+++ b/NumericalData/CDPP-AMDA/MMS/MMS1/HPCA/mms1-hpca-moms.xml
@@ -9,11 +9,11 @@
             <ReleaseDate>2017-01-16T11:50:00</ReleaseDate>
             <Description> </Description>         
             <Contact>
-                <PersonID>spase://CNES/Person/James.L.Burch</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/James.L.Burch</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/S.Fuselier</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/S.Fuselier</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/MMS/MMS1/HPCA/mms1-hpca-srvy.xml b/NumericalData/CDPP-AMDA/MMS/MMS1/HPCA/mms1-hpca-srvy.xml
index 5dee37a..975c83c 100644
--- a/NumericalData/CDPP-AMDA/MMS/MMS1/HPCA/mms1-hpca-srvy.xml
+++ b/NumericalData/CDPP-AMDA/MMS/MMS1/HPCA/mms1-hpca-srvy.xml
@@ -9,11 +9,11 @@
             <ReleaseDate>2020-10-02T11:50:00</ReleaseDate>
             <Description> </Description>         
             <Contact>
-                <PersonID>spase://CNES/Person/James.L.Burch</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/James.L.Burch</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/S.Fuselier</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/S.Fuselier</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/MMS/MMS1/Models/mms1-msph-models.xml b/NumericalData/CDPP-AMDA/MMS/MMS1/Models/mms1-msph-models.xml
index c46d964..5fa505c 100644
--- a/NumericalData/CDPP-AMDA/MMS/MMS1/Models/mms1-msph-models.xml
+++ b/NumericalData/CDPP-AMDA/MMS/MMS1/Models/mms1-msph-models.xml
@@ -12,7 +12,7 @@
          </Description>
          <Acknowledgement>TBD</Acknowledgement> 
          <Contact>
-            <PersonID>spase://CNES/Person/Christian.Jacquey</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Christian.Jacquey</PersonID>
             <Role>TechnicalContact</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/MMS/MMS1/Models/mms1-t96-model.xml b/NumericalData/CDPP-AMDA/MMS/MMS1/Models/mms1-t96-model.xml
index e6daa15..594e0f9 100644
--- a/NumericalData/CDPP-AMDA/MMS/MMS1/Models/mms1-t96-model.xml
+++ b/NumericalData/CDPP-AMDA/MMS/MMS1/Models/mms1-t96-model.xml
@@ -15,7 +15,7 @@
          </Description>
          <Acknowledgement>TBD</Acknowledgement> 
          <Contact>
-         <PersonID>spase://CNES/Person/Nikolai.Tsyganenko</PersonID>
+         <PersonID>spase://CNES/Person/CDPP-AMDA/Nikolai.Tsyganenko</PersonID>
             <Role>PrincipalInvestigator</Role>
          </Contact>            
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/MMS/MMS1234/Ephemeris/mms1234-orb-t89d.xml b/NumericalData/CDPP-AMDA/MMS/MMS1234/Ephemeris/mms1234-orb-t89d.xml
index d485011..b26c86b 100644
--- a/NumericalData/CDPP-AMDA/MMS/MMS1234/Ephemeris/mms1234-orb-t89d.xml
+++ b/NumericalData/CDPP-AMDA/MMS/MMS1234/Ephemeris/mms1234-orb-t89d.xml
@@ -9,11 +9,11 @@
 	    <Description>MMS tetrahedron formation. This dataset contains the barycenter of the tetrahedron and positions of the spacecrafts relative to the barycenter. Positions are expressed in GSE and GSM coordinate systems.
     </Description>         
            <Contact>
-               <PersonID>spase://CNES/Person/M.G.Henderson</PersonID>
+               <PersonID>spase://CNES/Person/CDPP-AMDA/M.G.Henderson</PersonID>
                <Role>PrincipalInvestigator</Role>
            </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/S.K.Morley</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/S.K.Morley</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/MMS/MMS1234/mms1-fgm-brstcurl.xml b/NumericalData/CDPP-AMDA/MMS/MMS1234/mms1-fgm-brstcurl.xml
index 71a91ae..6c6ea4f 100644
--- a/NumericalData/CDPP-AMDA/MMS/MMS1234/mms1-fgm-brstcurl.xml
+++ b/NumericalData/CDPP-AMDA/MMS/MMS1234/mms1-fgm-brstcurl.xml
@@ -9,7 +9,7 @@
             <ReleaseDate>2017-01-16T11:50:00</ReleaseDate>
             <Description/>
             <Contact>
-                <PersonID>spase://CNES/Person/Penou</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Penou</PersonID>
                 <Role>DataProducer</Role>
             </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/MMS/MMS1234/mms1-fgm-current.xml b/NumericalData/CDPP-AMDA/MMS/MMS1234/mms1-fgm-current.xml
index cfc4635..1c0ab40 100644
--- a/NumericalData/CDPP-AMDA/MMS/MMS1234/mms1-fgm-current.xml
+++ b/NumericalData/CDPP-AMDA/MMS/MMS1234/mms1-fgm-current.xml
@@ -9,7 +9,7 @@
             <ReleaseDate>2017-01-16T11:50:00</ReleaseDate>
             <Description/>
             <Contact>
-                <PersonID>spase://CNES/Person/Penou</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Penou</PersonID>
                 <Role>DataProducer</Role>
             </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/MMS/MMS2/EDP/mms2-edp-dce.xml b/NumericalData/CDPP-AMDA/MMS/MMS2/EDP/mms2-edp-dce.xml
index 00dd1d7..ead43a7 100644
--- a/NumericalData/CDPP-AMDA/MMS/MMS2/EDP/mms2-edp-dce.xml
+++ b/NumericalData/CDPP-AMDA/MMS/MMS2/EDP/mms2-edp-dce.xml
@@ -9,15 +9,15 @@
             <ReleaseDate>2017-01-16T11:50:00</ReleaseDate>
             <Description></Description>         
             <Contact>
-                <PersonID>spase://CNES/Person/James.L.Burch</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/James.L.Burch</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>  
             <Contact>
-                <PersonID>spase://CNES/Person/Robert.E.Ergun</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Robert.E.Ergun</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/P.Lindqvist</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/P.Lindqvist</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>    
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/MMS/MMS2/EDP/mms2-edp-hfesp.xml b/NumericalData/CDPP-AMDA/MMS/MMS2/EDP/mms2-edp-hfesp.xml
index 4a7af75..32f2075 100644
--- a/NumericalData/CDPP-AMDA/MMS/MMS2/EDP/mms2-edp-hfesp.xml
+++ b/NumericalData/CDPP-AMDA/MMS/MMS2/EDP/mms2-edp-hfesp.xml
@@ -9,15 +9,15 @@
             <ReleaseDate>2017-01-16T11:50:00</ReleaseDate>
             <Description></Description>         
             <Contact>
-                <PersonID>spase://CNES/Person/James.L.Burch</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/James.L.Burch</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>  
             <Contact>
-                <PersonID>spase://CNES/Person/Robert.E.Ergun</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Robert.E.Ergun</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/P.Lindqvist</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/P.Lindqvist</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>    
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/MMS/MMS2/EDP/mms2-edp-scpot.xml b/NumericalData/CDPP-AMDA/MMS/MMS2/EDP/mms2-edp-scpot.xml
index f5f1a6f..1de405a 100644
--- a/NumericalData/CDPP-AMDA/MMS/MMS2/EDP/mms2-edp-scpot.xml
+++ b/NumericalData/CDPP-AMDA/MMS/MMS2/EDP/mms2-edp-scpot.xml
@@ -9,15 +9,15 @@
             <ReleaseDate>2017-01-16T11:50:00</ReleaseDate>
             <Description/>
             <Contact>
-                <PersonID>spase://CNES/Person/James.L.Burch</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/James.L.Burch</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/Robert.E.Ergun</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Robert.E.Ergun</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/P.Lindqvist</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/P.Lindqvist</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/MMS/MMS2/Ephemeris/mms2-orb-t89d.xml b/NumericalData/CDPP-AMDA/MMS/MMS2/Ephemeris/mms2-orb-t89d.xml
index 7722520..5e6522a 100644
--- a/NumericalData/CDPP-AMDA/MMS/MMS2/Ephemeris/mms2-orb-t89d.xml
+++ b/NumericalData/CDPP-AMDA/MMS/MMS2/Ephemeris/mms2-orb-t89d.xml
@@ -8,11 +8,11 @@
             <ReleaseDate>2017-01-16T11:50:00</ReleaseDate>
             <Description>MMS2 position</Description>         
            <Contact>
-               <PersonID>spase://CNES/Person/M.G.Henderson</PersonID>
+               <PersonID>spase://CNES/Person/CDPP-AMDA/M.G.Henderson</PersonID>
                <Role>PrincipalInvestigator</Role>
            </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/S.K.Morley</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/S.K.Morley</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/MMS/MMS2/FGM/mms2-fgm-brst.xml b/NumericalData/CDPP-AMDA/MMS/MMS2/FGM/mms2-fgm-brst.xml
index 2e5a2c9..fc41589 100644
--- a/NumericalData/CDPP-AMDA/MMS/MMS2/FGM/mms2-fgm-brst.xml
+++ b/NumericalData/CDPP-AMDA/MMS/MMS2/FGM/mms2-fgm-brst.xml
@@ -15,7 +15,7 @@
                 0.15 nT along the spin-axis and 0.2 nT in total magnitude
             </Description>         
             <Contact>
-                <PersonID>spase://CNES/Person/James.L.Burch</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/James.L.Burch</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>  
             <Contact>
@@ -23,7 +23,7 @@
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/W.Magnus</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/W.Magnus</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact> 
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/MMS/MMS2/FGM/mms2-fgm-srvy.xml b/NumericalData/CDPP-AMDA/MMS/MMS2/FGM/mms2-fgm-srvy.xml
index cd03fe3..abc7323 100644
--- a/NumericalData/CDPP-AMDA/MMS/MMS2/FGM/mms2-fgm-srvy.xml
+++ b/NumericalData/CDPP-AMDA/MMS/MMS2/FGM/mms2-fgm-srvy.xml
@@ -15,7 +15,7 @@
                 0.15 nT along the spin-axis and 0.2 nT in total magnitude
             </Description>         
             <Contact>
-                <PersonID>spase://CNES/Person/James.L.Burch</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/James.L.Burch</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>  
             <Contact>
@@ -23,7 +23,7 @@
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/W.Magnus</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/W.Magnus</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact> 
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/MMS/MMS2/FPI/mms2-fpi-brst.current.xml b/NumericalData/CDPP-AMDA/MMS/MMS2/FPI/mms2-fpi-brst.current.xml
index f7a23a6..4edeb68 100644
--- a/NumericalData/CDPP-AMDA/MMS/MMS2/FPI/mms2-fpi-brst.current.xml
+++ b/NumericalData/CDPP-AMDA/MMS/MMS2/FPI/mms2-fpi-brst.current.xml
@@ -12,11 +12,11 @@
             Electric current: mms2_brst_jgse = 1.6e-10*(mms2_brst_desm_n+mms2_brst_dism_n)*0.5*(mms2_brst_dism_v-mms2_brst_desm_v)
             </Description>         
             <Contact>
-                <PersonID>spase://CNES/Person/James.L.Burch</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/James.L.Burch</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/B.Giles</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/B.Giles</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact> 
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/MMS/MMS2/FPI/mms2-fpi-brst.desm.xml b/NumericalData/CDPP-AMDA/MMS/MMS2/FPI/mms2-fpi-brst.desm.xml
index 81d7ce0..fb0aa90 100644
--- a/NumericalData/CDPP-AMDA/MMS/MMS2/FPI/mms2-fpi-brst.desm.xml
+++ b/NumericalData/CDPP-AMDA/MMS/MMS2/FPI/mms2-fpi-brst.desm.xml
@@ -32,11 +32,11 @@ dicated time.
             * Bit-11 = compression pipeline error
             * Bit-12 = spintone calculation error (DBCS only)</Description>         
              <Contact>
-                 <PersonID>spase://CNES/Person/James.L.Burch</PersonID>
+                 <PersonID>spase://CNES/Person/CDPP-AMDA/James.L.Burch</PersonID>
                  <Role>PrincipalInvestigator</Role>
              </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/B.Giles</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/B.Giles</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact> 
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/MMS/MMS2/FPI/mms2-fpi-brst.dism.xml b/NumericalData/CDPP-AMDA/MMS/MMS2/FPI/mms2-fpi-brst.dism.xml
index b6e4979..762f6a6 100644
--- a/NumericalData/CDPP-AMDA/MMS/MMS2/FPI/mms2-fpi-brst.dism.xml
+++ b/NumericalData/CDPP-AMDA/MMS/MMS2/FPI/mms2-fpi-brst.dism.xml
@@ -34,11 +34,11 @@ dicated time.
             * Bit-13 = significant (greater than 20%) penetrating radiation
             </Description>         
              <Contact>
-                 <PersonID>spase://CNES/Person/James.L.Burch</PersonID>
+                 <PersonID>spase://CNES/Person/CDPP-AMDA/James.L.Burch</PersonID>
                  <Role>PrincipalInvestigator</Role>
              </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/B.Giles</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/B.Giles</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact> 
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/MMS/MMS2/FPI/mms2-fpi-current.xml b/NumericalData/CDPP-AMDA/MMS/MMS2/FPI/mms2-fpi-current.xml
index 0ea7ba1..5c9274b 100644
--- a/NumericalData/CDPP-AMDA/MMS/MMS2/FPI/mms2-fpi-current.xml
+++ b/NumericalData/CDPP-AMDA/MMS/MMS2/FPI/mms2-fpi-current.xml
@@ -12,11 +12,11 @@
             Electric current: mms2_fast_jgse = 1.6e-10*(mms2_des_ne+mms2_dis_ni)*0.5*(mms2_dis_vgse-mms2_des_vgse)
             </Description>         
             <Contact>
-                <PersonID>spase://CNES/Person/James.L.Burch</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/James.L.Burch</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/B.Giles</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/B.Giles</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact> 
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/MMS/MMS2/FPI/mms2-fpi-desmoms.xml b/NumericalData/CDPP-AMDA/MMS/MMS2/FPI/mms2-fpi-desmoms.xml
index 47a74a5..3c9c727 100644
--- a/NumericalData/CDPP-AMDA/MMS/MMS2/FPI/mms2-fpi-desmoms.xml
+++ b/NumericalData/CDPP-AMDA/MMS/MMS2/FPI/mms2-fpi-desmoms.xml
@@ -16,11 +16,11 @@ the current Mission Phase.  Data are taken at burst (30/150 ms for DES/DIS) reso
 product of this sort, plus time-stamps and other annotation characterizing the state of the instrument system at the in
 dicated time.</Description>         
              <Contact>
-                 <PersonID>spase://CNES/Person/James.L.Burch</PersonID>
+                 <PersonID>spase://CNES/Person/CDPP-AMDA/James.L.Burch</PersonID>
                  <Role>PrincipalInvestigator</Role>
              </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/B.Giles</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/B.Giles</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact> 
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/MMS/MMS2/FPI/mms2-fpi-dismoms.xml b/NumericalData/CDPP-AMDA/MMS/MMS2/FPI/mms2-fpi-dismoms.xml
index 84ae659..b8ce579 100644
--- a/NumericalData/CDPP-AMDA/MMS/MMS2/FPI/mms2-fpi-dismoms.xml
+++ b/NumericalData/CDPP-AMDA/MMS/MMS2/FPI/mms2-fpi-dismoms.xml
@@ -16,11 +16,11 @@ the current Mission Phase.  Data are taken at burst (30/150 ms for DES/DIS) reso
 product of this sort, plus time-stamps and other annotation characterizing the state of the instrument system at the in
 dicated time.</Description>         
              <Contact>
-                 <PersonID>spase://CNES/Person/James.L.Burch</PersonID>
+                 <PersonID>spase://CNES/Person/CDPP-AMDA/James.L.Burch</PersonID>
                  <Role>PrincipalInvestigator</Role>
              </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/B.Giles</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/B.Giles</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact> 
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/MMS/MMS2/HPCA/mms2-hpca-brst.xml b/NumericalData/CDPP-AMDA/MMS/MMS2/HPCA/mms2-hpca-brst.xml
index 2540401..e6fa5df 100644
--- a/NumericalData/CDPP-AMDA/MMS/MMS2/HPCA/mms2-hpca-brst.xml
+++ b/NumericalData/CDPP-AMDA/MMS/MMS2/HPCA/mms2-hpca-brst.xml
@@ -9,11 +9,11 @@
             <ReleaseDate>2020-10-02T11:50:00</ReleaseDate>
             <Description> </Description>         
             <Contact>
-                <PersonID>spase://CNES/Person/James.L.Burch</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/James.L.Burch</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/S.Fuselier</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/S.Fuselier</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/MMS/MMS2/Models/mms2-msph-models.xml b/NumericalData/CDPP-AMDA/MMS/MMS2/Models/mms2-msph-models.xml
index 992cdc8..2e05334 100644
--- a/NumericalData/CDPP-AMDA/MMS/MMS2/Models/mms2-msph-models.xml
+++ b/NumericalData/CDPP-AMDA/MMS/MMS2/Models/mms2-msph-models.xml
@@ -12,7 +12,7 @@
          </Description>
          <Acknowledgement>TBD</Acknowledgement> 
          <Contact>
-            <PersonID>spase://CNES/Person/Christian.Jacquey</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Christian.Jacquey</PersonID>
             <Role>TechnicalContact</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/MMS/MMS2/Models/mms2-t96-model.xml b/NumericalData/CDPP-AMDA/MMS/MMS2/Models/mms2-t96-model.xml
index ad3e94a..78cf54c 100644
--- a/NumericalData/CDPP-AMDA/MMS/MMS2/Models/mms2-t96-model.xml
+++ b/NumericalData/CDPP-AMDA/MMS/MMS2/Models/mms2-t96-model.xml
@@ -15,7 +15,7 @@
          </Description>
          <Acknowledgement>TBD</Acknowledgement> 
          <Contact>
-         <PersonID>spase://CNES/Person/Nikolai.Tsyganenko</PersonID>
+         <PersonID>spase://CNES/Person/CDPP-AMDA/Nikolai.Tsyganenko</PersonID>
             <Role>PrincipalInvestigator</Role>
          </Contact>            
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/MMS/MMS3/EDP/mms3-edp-dce.xml b/NumericalData/CDPP-AMDA/MMS/MMS3/EDP/mms3-edp-dce.xml
index 0652f94..bf943fc 100644
--- a/NumericalData/CDPP-AMDA/MMS/MMS3/EDP/mms3-edp-dce.xml
+++ b/NumericalData/CDPP-AMDA/MMS/MMS3/EDP/mms3-edp-dce.xml
@@ -9,15 +9,15 @@
             <ReleaseDate>2017-01-16T11:50:00</ReleaseDate>
             <Description></Description>         
             <Contact>
-                <PersonID>spase://CNES/Person/James.L.Burch</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/James.L.Burch</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>  
             <Contact>
-                <PersonID>spase://CNES/Person/Robert.E.Ergun</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Robert.E.Ergun</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/P.Lindqvist</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/P.Lindqvist</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>    
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/MMS/MMS3/EDP/mms3-edp-hfesp.xml b/NumericalData/CDPP-AMDA/MMS/MMS3/EDP/mms3-edp-hfesp.xml
index 2a23b35..93cbf19 100644
--- a/NumericalData/CDPP-AMDA/MMS/MMS3/EDP/mms3-edp-hfesp.xml
+++ b/NumericalData/CDPP-AMDA/MMS/MMS3/EDP/mms3-edp-hfesp.xml
@@ -9,15 +9,15 @@
             <ReleaseDate>2017-01-16T11:50:00</ReleaseDate>
             <Description></Description>         
             <Contact>
-                <PersonID>spase://CNES/Person/James.L.Burch</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/James.L.Burch</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>  
             <Contact>
-                <PersonID>spase://CNES/Person/Robert.E.Ergun</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Robert.E.Ergun</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/P.Lindqvist</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/P.Lindqvist</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>    
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/MMS/MMS3/EDP/mms3-edp-scpot.xml b/NumericalData/CDPP-AMDA/MMS/MMS3/EDP/mms3-edp-scpot.xml
index 6191ec0..0eb01b3 100644
--- a/NumericalData/CDPP-AMDA/MMS/MMS3/EDP/mms3-edp-scpot.xml
+++ b/NumericalData/CDPP-AMDA/MMS/MMS3/EDP/mms3-edp-scpot.xml
@@ -9,15 +9,15 @@
             <ReleaseDate>2017-01-16T11:50:00</ReleaseDate>
             <Description/>
             <Contact>
-                <PersonID>spase://CNES/Person/James.L.Burch</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/James.L.Burch</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/Robert.E.Ergun</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Robert.E.Ergun</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/P.Lindqvist</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/P.Lindqvist</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/MMS/MMS3/Ephemeris/mms3-orb-t89d.xml b/NumericalData/CDPP-AMDA/MMS/MMS3/Ephemeris/mms3-orb-t89d.xml
index 1b60ffc..267b29e 100644
--- a/NumericalData/CDPP-AMDA/MMS/MMS3/Ephemeris/mms3-orb-t89d.xml
+++ b/NumericalData/CDPP-AMDA/MMS/MMS3/Ephemeris/mms3-orb-t89d.xml
@@ -8,11 +8,11 @@
             <ReleaseDate>2017-01-16T11:50:00</ReleaseDate>
             <Description>MMS3 position</Description>         
            <Contact>
-               <PersonID>spase://CNES/Person/M.G.Henderson</PersonID>
+               <PersonID>spase://CNES/Person/CDPP-AMDA/M.G.Henderson</PersonID>
                <Role>PrincipalInvestigator</Role>
            </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/S.K.Morley</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/S.K.Morley</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/MMS/MMS3/FGM/mms3-fgm-brst.xml b/NumericalData/CDPP-AMDA/MMS/MMS3/FGM/mms3-fgm-brst.xml
index 0179d82..be89883 100644
--- a/NumericalData/CDPP-AMDA/MMS/MMS3/FGM/mms3-fgm-brst.xml
+++ b/NumericalData/CDPP-AMDA/MMS/MMS3/FGM/mms3-fgm-brst.xml
@@ -15,7 +15,7 @@
                 0.15 nT along the spin-axis and 0.2 nT in total magnitude
             </Description>         
             <Contact>
-                <PersonID>spase://CNES/Person/James.L.Burch</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/James.L.Burch</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>  
             <Contact>
@@ -23,7 +23,7 @@
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/W.Magnus</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/W.Magnus</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact> 
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/MMS/MMS3/FGM/mms3-fgm-srvy.xml b/NumericalData/CDPP-AMDA/MMS/MMS3/FGM/mms3-fgm-srvy.xml
index e266d0e..6bce9bf 100644
--- a/NumericalData/CDPP-AMDA/MMS/MMS3/FGM/mms3-fgm-srvy.xml
+++ b/NumericalData/CDPP-AMDA/MMS/MMS3/FGM/mms3-fgm-srvy.xml
@@ -15,7 +15,7 @@
                 0.15 nT along the spin-axis and 0.2 nT in total magnitude
             </Description>         
             <Contact>
-                <PersonID>spase://CNES/Person/James.L.Burch</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/James.L.Burch</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>  
             <Contact>
@@ -23,7 +23,7 @@
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/W.Magnus</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/W.Magnus</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact> 
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/MMS/MMS3/FPI/mms3-fpi-brst.current.xml b/NumericalData/CDPP-AMDA/MMS/MMS3/FPI/mms3-fpi-brst.current.xml
index f0a44fe..4969870 100644
--- a/NumericalData/CDPP-AMDA/MMS/MMS3/FPI/mms3-fpi-brst.current.xml
+++ b/NumericalData/CDPP-AMDA/MMS/MMS3/FPI/mms3-fpi-brst.current.xml
@@ -12,11 +12,11 @@
             Electric current: mms3_brst_jgse = 1.6e-10*(mms3_brst_desm_n+mms3_brst_dism_n)*0.5*(mms3_brst_dism_v-mms3_brst_desm_v)
             </Description>         
             <Contact>
-                <PersonID>spase://CNES/Person/James.L.Burch</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/James.L.Burch</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/B.Giles</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/B.Giles</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact> 
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/MMS/MMS3/FPI/mms3-fpi-brst.desm.xml b/NumericalData/CDPP-AMDA/MMS/MMS3/FPI/mms3-fpi-brst.desm.xml
index cc08c33..da32bcf 100644
--- a/NumericalData/CDPP-AMDA/MMS/MMS3/FPI/mms3-fpi-brst.desm.xml
+++ b/NumericalData/CDPP-AMDA/MMS/MMS3/FPI/mms3-fpi-brst.desm.xml
@@ -32,11 +32,11 @@ dicated time.
             * Bit-11 = compression pipeline error
             * Bit-12 = spintone calculation error (DBCS only)</Description>         
              <Contact>
-                 <PersonID>spase://CNES/Person/James.L.Burch</PersonID>
+                 <PersonID>spase://CNES/Person/CDPP-AMDA/James.L.Burch</PersonID>
                  <Role>PrincipalInvestigator</Role>
              </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/B.Giles</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/B.Giles</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact> 
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/MMS/MMS3/FPI/mms3-fpi-brst.dism.xml b/NumericalData/CDPP-AMDA/MMS/MMS3/FPI/mms3-fpi-brst.dism.xml
index f51c682..1ea94ec 100644
--- a/NumericalData/CDPP-AMDA/MMS/MMS3/FPI/mms3-fpi-brst.dism.xml
+++ b/NumericalData/CDPP-AMDA/MMS/MMS3/FPI/mms3-fpi-brst.dism.xml
@@ -34,11 +34,11 @@ dicated time.
             * Bit-13 = significant (greater than 20%) penetrating radiation
             </Description>         
              <Contact>
-                 <PersonID>spase://CNES/Person/James.L.Burch</PersonID>
+                 <PersonID>spase://CNES/Person/CDPP-AMDA/James.L.Burch</PersonID>
                  <Role>PrincipalInvestigator</Role>
              </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/B.Giles</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/B.Giles</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact> 
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/MMS/MMS3/FPI/mms3-fpi-current.xml b/NumericalData/CDPP-AMDA/MMS/MMS3/FPI/mms3-fpi-current.xml
index fb01e23..96e68fc 100644
--- a/NumericalData/CDPP-AMDA/MMS/MMS3/FPI/mms3-fpi-current.xml
+++ b/NumericalData/CDPP-AMDA/MMS/MMS3/FPI/mms3-fpi-current.xml
@@ -12,11 +12,11 @@
             Electric current: mms3_fast_jgse = 1.6e-10*(mms3_des_ne+mms3_dis_ni)*0.5*(mms3_dis_vgse-mms3_des_vgse)
             </Description>         
             <Contact>
-                <PersonID>spase://CNES/Person/James.L.Burch</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/James.L.Burch</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/B.Giles</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/B.Giles</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact> 
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/MMS/MMS3/FPI/mms3-fpi-desmoms.xml b/NumericalData/CDPP-AMDA/MMS/MMS3/FPI/mms3-fpi-desmoms.xml
index 4d532b4..9e0e1bb 100644
--- a/NumericalData/CDPP-AMDA/MMS/MMS3/FPI/mms3-fpi-desmoms.xml
+++ b/NumericalData/CDPP-AMDA/MMS/MMS3/FPI/mms3-fpi-desmoms.xml
@@ -16,11 +16,11 @@ the current Mission Phase.  Data are taken at burst (30/150 ms for DES/DIS) reso
 product of this sort, plus time-stamps and other annotation characterizing the state of the instrument system at the in
 dicated time.</Description>         
              <Contact>
-                 <PersonID>spase://CNES/Person/James.L.Burch</PersonID>
+                 <PersonID>spase://CNES/Person/CDPP-AMDA/James.L.Burch</PersonID>
                  <Role>PrincipalInvestigator</Role>
              </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/B.Giles</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/B.Giles</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact> 
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/MMS/MMS3/FPI/mms3-fpi-dismoms.xml b/NumericalData/CDPP-AMDA/MMS/MMS3/FPI/mms3-fpi-dismoms.xml
index d34f296..e79d1c0 100644
--- a/NumericalData/CDPP-AMDA/MMS/MMS3/FPI/mms3-fpi-dismoms.xml
+++ b/NumericalData/CDPP-AMDA/MMS/MMS3/FPI/mms3-fpi-dismoms.xml
@@ -16,11 +16,11 @@ the current Mission Phase.  Data are taken at burst (30/150 ms for DES/DIS) reso
 product of this sort, plus time-stamps and other annotation characterizing the state of the instrument system at the in
 dicated time.</Description>         
              <Contact>
-                 <PersonID>spase://CNES/Person/James.L.Burch</PersonID>
+                 <PersonID>spase://CNES/Person/CDPP-AMDA/James.L.Burch</PersonID>
                  <Role>PrincipalInvestigator</Role>
              </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/B.Giles</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/B.Giles</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact> 
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/MMS/MMS3/HPCA/mms3-hpca-brst.xml b/NumericalData/CDPP-AMDA/MMS/MMS3/HPCA/mms3-hpca-brst.xml
index 42679b7..987bfc7 100644
--- a/NumericalData/CDPP-AMDA/MMS/MMS3/HPCA/mms3-hpca-brst.xml
+++ b/NumericalData/CDPP-AMDA/MMS/MMS3/HPCA/mms3-hpca-brst.xml
@@ -9,11 +9,11 @@
             <ReleaseDate>2020-10-02T11:50:00</ReleaseDate>
             <Description> </Description>         
             <Contact>
-                <PersonID>spase://CNES/Person/James.L.Burch</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/James.L.Burch</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/S.Fuselier</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/S.Fuselier</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/MMS/MMS3/Models/mms3-msph-models.xml b/NumericalData/CDPP-AMDA/MMS/MMS3/Models/mms3-msph-models.xml
index 3ee733a..54a947a 100644
--- a/NumericalData/CDPP-AMDA/MMS/MMS3/Models/mms3-msph-models.xml
+++ b/NumericalData/CDPP-AMDA/MMS/MMS3/Models/mms3-msph-models.xml
@@ -12,7 +12,7 @@
          </Description>
          <Acknowledgement>TBD</Acknowledgement> 
          <Contact>
-            <PersonID>spase://CNES/Person/Christian.Jacquey</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Christian.Jacquey</PersonID>
             <Role>TechnicalContact</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/MMS/MMS3/Models/mms3-t96-model.xml b/NumericalData/CDPP-AMDA/MMS/MMS3/Models/mms3-t96-model.xml
index 2c1402b..c6222db 100644
--- a/NumericalData/CDPP-AMDA/MMS/MMS3/Models/mms3-t96-model.xml
+++ b/NumericalData/CDPP-AMDA/MMS/MMS3/Models/mms3-t96-model.xml
@@ -15,7 +15,7 @@
          </Description>
          <Acknowledgement>TBD</Acknowledgement> 
          <Contact>
-         <PersonID>spase://CNES/Person/Nikolai.Tsyganenko</PersonID>
+         <PersonID>spase://CNES/Person/CDPP-AMDA/Nikolai.Tsyganenko</PersonID>
             <Role>PrincipalInvestigator</Role>
          </Contact>            
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/MMS/MMS4/EDP/mms4-edp-dce.xml b/NumericalData/CDPP-AMDA/MMS/MMS4/EDP/mms4-edp-dce.xml
index 44e865e..513a3c9 100644
--- a/NumericalData/CDPP-AMDA/MMS/MMS4/EDP/mms4-edp-dce.xml
+++ b/NumericalData/CDPP-AMDA/MMS/MMS4/EDP/mms4-edp-dce.xml
@@ -9,15 +9,15 @@
             <ReleaseDate>2017-01-16T11:50:00</ReleaseDate>
             <Description></Description>         
             <Contact>
-                <PersonID>spase://CNES/Person/James.L.Burch</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/James.L.Burch</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>  
             <Contact>
-                <PersonID>spase://CNES/Person/Robert.E.Ergun</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Robert.E.Ergun</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/P.Lindqvist</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/P.Lindqvist</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>    
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/MMS/MMS4/EDP/mms4-edp-hfesp.xml b/NumericalData/CDPP-AMDA/MMS/MMS4/EDP/mms4-edp-hfesp.xml
index ea564c0..b800976 100644
--- a/NumericalData/CDPP-AMDA/MMS/MMS4/EDP/mms4-edp-hfesp.xml
+++ b/NumericalData/CDPP-AMDA/MMS/MMS4/EDP/mms4-edp-hfesp.xml
@@ -9,15 +9,15 @@
             <ReleaseDate>2017-01-16T11:50:00</ReleaseDate>
             <Description></Description>         
             <Contact>
-                <PersonID>spase://CNES/Person/James.L.Burch</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/James.L.Burch</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>  
             <Contact>
-                <PersonID>spase://CNES/Person/Robert.E.Ergun</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Robert.E.Ergun</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/P.Lindqvist</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/P.Lindqvist</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>    
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/MMS/MMS4/EDP/mms4-edp-scpot.xml b/NumericalData/CDPP-AMDA/MMS/MMS4/EDP/mms4-edp-scpot.xml
index 5d976d9..e92f71e 100644
--- a/NumericalData/CDPP-AMDA/MMS/MMS4/EDP/mms4-edp-scpot.xml
+++ b/NumericalData/CDPP-AMDA/MMS/MMS4/EDP/mms4-edp-scpot.xml
@@ -9,15 +9,15 @@
             <ReleaseDate>2017-01-16T11:50:00</ReleaseDate>
             <Description/>
             <Contact>
-                <PersonID>spase://CNES/Person/James.L.Burch</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/James.L.Burch</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/Robert.E.Ergun</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Robert.E.Ergun</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/P.Lindqvist</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/P.Lindqvist</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/MMS/MMS4/Ephemeris/mms4-orb-t89d.xml b/NumericalData/CDPP-AMDA/MMS/MMS4/Ephemeris/mms4-orb-t89d.xml
index c700717..0a892e8 100644
--- a/NumericalData/CDPP-AMDA/MMS/MMS4/Ephemeris/mms4-orb-t89d.xml
+++ b/NumericalData/CDPP-AMDA/MMS/MMS4/Ephemeris/mms4-orb-t89d.xml
@@ -8,11 +8,11 @@
             <ReleaseDate>2017-01-16T11:50:00</ReleaseDate>
             <Description>MMS4 position</Description>         
            <Contact>
-               <PersonID>spase://CNES/Person/M.G.Henderson</PersonID>
+               <PersonID>spase://CNES/Person/CDPP-AMDA/M.G.Henderson</PersonID>
                <Role>PrincipalInvestigator</Role>
            </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/S.K.Morley</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/S.K.Morley</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/MMS/MMS4/FGM/mms4-fgm-brst.xml b/NumericalData/CDPP-AMDA/MMS/MMS4/FGM/mms4-fgm-brst.xml
index 945ef0f..64af554 100644
--- a/NumericalData/CDPP-AMDA/MMS/MMS4/FGM/mms4-fgm-brst.xml
+++ b/NumericalData/CDPP-AMDA/MMS/MMS4/FGM/mms4-fgm-brst.xml
@@ -15,7 +15,7 @@
                 0.15 nT along the spin-axis and 0.2 nT in total magnitude
             </Description>         
             <Contact>
-                <PersonID>spase://CNES/Person/James.L.Burch</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/James.L.Burch</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>  
             <Contact>
@@ -23,7 +23,7 @@
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/W.Magnus</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/W.Magnus</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact> 
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/MMS/MMS4/FGM/mms4-fgm-srvy.xml b/NumericalData/CDPP-AMDA/MMS/MMS4/FGM/mms4-fgm-srvy.xml
index 122b001..3254ac8 100644
--- a/NumericalData/CDPP-AMDA/MMS/MMS4/FGM/mms4-fgm-srvy.xml
+++ b/NumericalData/CDPP-AMDA/MMS/MMS4/FGM/mms4-fgm-srvy.xml
@@ -15,7 +15,7 @@
                 0.15 nT along the spin-axis and 0.2 nT in total magnitude
             </Description>         
             <Contact>
-                <PersonID>spase://CNES/Person/James.L.Burch</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/James.L.Burch</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>  
             <Contact>
@@ -23,7 +23,7 @@
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/W.Magnus</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/W.Magnus</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact> 
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/MMS/MMS4/FPI/mms4-fpi-brst.current.xml b/NumericalData/CDPP-AMDA/MMS/MMS4/FPI/mms4-fpi-brst.current.xml
index 0abac0b..0c2e8fa 100644
--- a/NumericalData/CDPP-AMDA/MMS/MMS4/FPI/mms4-fpi-brst.current.xml
+++ b/NumericalData/CDPP-AMDA/MMS/MMS4/FPI/mms4-fpi-brst.current.xml
@@ -12,11 +12,11 @@
             Electric current: mms4_brst_jgse = 1.6e-10*(mms4_brst_desm_n+mms4_brst_dism_n)*0.5*(mms4_brst_dism_v-mms4_brst_desm_v)
             </Description>         
             <Contact>
-                <PersonID>spase://CNES/Person/James.L.Burch</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/James.L.Burch</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/B.Giles</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/B.Giles</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact> 
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/MMS/MMS4/FPI/mms4-fpi-brst.desm.xml b/NumericalData/CDPP-AMDA/MMS/MMS4/FPI/mms4-fpi-brst.desm.xml
index b0f3907..8ab4f92 100644
--- a/NumericalData/CDPP-AMDA/MMS/MMS4/FPI/mms4-fpi-brst.desm.xml
+++ b/NumericalData/CDPP-AMDA/MMS/MMS4/FPI/mms4-fpi-brst.desm.xml
@@ -32,11 +32,11 @@ dicated time.
             * Bit-11 = compression pipeline error
             * Bit-12 = spintone calculation error (DBCS only)</Description>         
              <Contact>
-                 <PersonID>spase://CNES/Person/James.L.Burch</PersonID>
+                 <PersonID>spase://CNES/Person/CDPP-AMDA/James.L.Burch</PersonID>
                  <Role>PrincipalInvestigator</Role>
              </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/B.Giles</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/B.Giles</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact> 
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/MMS/MMS4/FPI/mms4-fpi-brst.dism.xml b/NumericalData/CDPP-AMDA/MMS/MMS4/FPI/mms4-fpi-brst.dism.xml
index a36db6b..80b40e4 100644
--- a/NumericalData/CDPP-AMDA/MMS/MMS4/FPI/mms4-fpi-brst.dism.xml
+++ b/NumericalData/CDPP-AMDA/MMS/MMS4/FPI/mms4-fpi-brst.dism.xml
@@ -34,11 +34,11 @@ dicated time.
             * Bit-13 = significant (greater than 20%) penetrating radiation
             </Description>         
              <Contact>
-                 <PersonID>spase://CNES/Person/James.L.Burch</PersonID>
+                 <PersonID>spase://CNES/Person/CDPP-AMDA/James.L.Burch</PersonID>
                  <Role>PrincipalInvestigator</Role>
              </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/B.Giles</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/B.Giles</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact> 
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/MMS/MMS4/FPI/mms4-fpi-current.xml b/NumericalData/CDPP-AMDA/MMS/MMS4/FPI/mms4-fpi-current.xml
index 2d5cf5b..86c06b9 100644
--- a/NumericalData/CDPP-AMDA/MMS/MMS4/FPI/mms4-fpi-current.xml
+++ b/NumericalData/CDPP-AMDA/MMS/MMS4/FPI/mms4-fpi-current.xml
@@ -12,11 +12,11 @@
             Electric current: mms4_fast_jgse = 1.6e-10*(mms4_des_ne+mms4_dis_ni)*0.5*(mms4_dis_vgse-mms4_des_vgse)
             </Description>         
             <Contact>
-                <PersonID>spase://CNES/Person/James.L.Burch</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/James.L.Burch</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/B.Giles</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/B.Giles</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact> 
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/MMS/MMS4/FPI/mms4-fpi-desmoms.xml b/NumericalData/CDPP-AMDA/MMS/MMS4/FPI/mms4-fpi-desmoms.xml
index e8da8ab..7bb00a6 100644
--- a/NumericalData/CDPP-AMDA/MMS/MMS4/FPI/mms4-fpi-desmoms.xml
+++ b/NumericalData/CDPP-AMDA/MMS/MMS4/FPI/mms4-fpi-desmoms.xml
@@ -16,11 +16,11 @@ the current Mission Phase.  Data are taken at burst (30/150 ms for DES/DIS) reso
 product of this sort, plus time-stamps and other annotation characterizing the state of the instrument system at the in
 dicated time.</Description>         
              <Contact>
-                 <PersonID>spase://CNES/Person/James.L.Burch</PersonID>
+                 <PersonID>spase://CNES/Person/CDPP-AMDA/James.L.Burch</PersonID>
                  <Role>PrincipalInvestigator</Role>
              </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/B.Giles</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/B.Giles</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact> 
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/MMS/MMS4/FPI/mms4-fpi-dismoms.xml b/NumericalData/CDPP-AMDA/MMS/MMS4/FPI/mms4-fpi-dismoms.xml
index 3281d19..9afec9b 100644
--- a/NumericalData/CDPP-AMDA/MMS/MMS4/FPI/mms4-fpi-dismoms.xml
+++ b/NumericalData/CDPP-AMDA/MMS/MMS4/FPI/mms4-fpi-dismoms.xml
@@ -16,11 +16,11 @@ the current Mission Phase.  Data are taken at burst (30/150 ms for DES/DIS) reso
 product of this sort, plus time-stamps and other annotation characterizing the state of the instrument system at the in
 dicated time.</Description>         
              <Contact>
-                 <PersonID>spase://CNES/Person/James.L.Burch</PersonID>
+                 <PersonID>spase://CNES/Person/CDPP-AMDA/James.L.Burch</PersonID>
                  <Role>PrincipalInvestigator</Role>
              </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/B.Giles</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/B.Giles</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact> 
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/MMS/MMS4/HPCA/mms4-hpca-brst.xml b/NumericalData/CDPP-AMDA/MMS/MMS4/HPCA/mms4-hpca-brst.xml
index 18f3e94..e8bd883 100644
--- a/NumericalData/CDPP-AMDA/MMS/MMS4/HPCA/mms4-hpca-brst.xml
+++ b/NumericalData/CDPP-AMDA/MMS/MMS4/HPCA/mms4-hpca-brst.xml
@@ -9,11 +9,11 @@
             <ReleaseDate>2020-10-02T11:50:00</ReleaseDate>
             <Description> </Description>         
             <Contact>
-                <PersonID>spase://CNES/Person/James.L.Burch</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/James.L.Burch</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/S.Fuselier</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/S.Fuselier</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/MMS/MMS4/Models/mms4-msph-models.xml b/NumericalData/CDPP-AMDA/MMS/MMS4/Models/mms4-msph-models.xml
index b3dd3bb..ba660d6 100644
--- a/NumericalData/CDPP-AMDA/MMS/MMS4/Models/mms4-msph-models.xml
+++ b/NumericalData/CDPP-AMDA/MMS/MMS4/Models/mms4-msph-models.xml
@@ -12,7 +12,7 @@
          </Description>
          <Acknowledgement>TBD</Acknowledgement> 
          <Contact>
-            <PersonID>spase://CNES/Person/Christian.Jacquey</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Christian.Jacquey</PersonID>
             <Role>TechnicalContact</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/MMS/MMS4/Models/mms4-t96-model.xml b/NumericalData/CDPP-AMDA/MMS/MMS4/Models/mms4-t96-model.xml
index a938861..dd172e9 100644
--- a/NumericalData/CDPP-AMDA/MMS/MMS4/Models/mms4-t96-model.xml
+++ b/NumericalData/CDPP-AMDA/MMS/MMS4/Models/mms4-t96-model.xml
@@ -15,7 +15,7 @@
          </Description>
          <Acknowledgement>TBD</Acknowledgement> 
          <Contact>
-         <PersonID>spase://CNES/Person/Nikolai.Tsyganenko</PersonID>
+         <PersonID>spase://CNES/Person/CDPP-AMDA/Nikolai.Tsyganenko</PersonID>
             <Role>PrincipalInvestigator</Role>
          </Contact>            
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Mariner10/Ephemeris/m10-m1-orb.xml b/NumericalData/CDPP-AMDA/Mariner10/Ephemeris/m10-m1-orb.xml
index c889ed3..99b8c71 100644
--- a/NumericalData/CDPP-AMDA/Mariner10/Ephemeris/m10-m1-orb.xml
+++ b/NumericalData/CDPP-AMDA/Mariner10/Ephemeris/m10-m1-orb.xml
@@ -12,7 +12,7 @@
 		    * PC : Position vectors are given as a range (Rm = 2439.7 km), Latitude, and East Longitude. Field vectors at the spacecraft are given as a radial compoment from Mercury to the spacecraft, an azimuthal component that is parallel to the equator and perpendicular to the radial direction, and a north/south component that completes the right-handed set.
     </Description>
             <Contact>
-                <PersonID>spase://CNES/Person/Norman.F.Ness</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Norman.F.Ness</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
         </ResourceHeader>
diff --git a/NumericalData/CDPP-AMDA/Mariner10/Ephemeris/m10-m2-orb.xml b/NumericalData/CDPP-AMDA/Mariner10/Ephemeris/m10-m2-orb.xml
index 8082ae5..0fedcf0 100644
--- a/NumericalData/CDPP-AMDA/Mariner10/Ephemeris/m10-m2-orb.xml
+++ b/NumericalData/CDPP-AMDA/Mariner10/Ephemeris/m10-m2-orb.xml
@@ -10,7 +10,7 @@
 		    * SEQ : unreference/ambiguous definition (center = Sun) - feedback welcome.
             </Description>
             <Contact>
-                <PersonID>spase://CNES/Person/Norman.F.Ness</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Norman.F.Ness</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
         </ResourceHeader>
diff --git a/NumericalData/CDPP-AMDA/Mariner10/Ephemeris/m10-m3-orb.xml b/NumericalData/CDPP-AMDA/Mariner10/Ephemeris/m10-m3-orb.xml
index 2292a9d..c6db222 100644
--- a/NumericalData/CDPP-AMDA/Mariner10/Ephemeris/m10-m3-orb.xml
+++ b/NumericalData/CDPP-AMDA/Mariner10/Ephemeris/m10-m3-orb.xml
@@ -10,7 +10,7 @@
 		 * SEQ : unreference/ambiguous definition (center = Sun) - feedback welcome.
  </Description>
          <Contact>
-                <PersonID>spase://CNES/Person/Norman.F.Ness</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Norman.F.Ness</PersonID>
                 <Role>PrincipalInvestigator</Role>
          </Contact>
       </ResourceHeader>
diff --git a/NumericalData/CDPP-AMDA/Mariner10/MAG/m10-mag-m1highres.xml b/NumericalData/CDPP-AMDA/Mariner10/MAG/m10-mag-m1highres.xml
index 7e3d50c..3e45d23 100644
--- a/NumericalData/CDPP-AMDA/Mariner10/MAG/m10-mag-m1highres.xml
+++ b/NumericalData/CDPP-AMDA/Mariner10/MAG/m10-mag-m1highres.xml
@@ -11,7 +11,7 @@
 	      * MSEQ : X (Mercury to Sun), Z (X-Z plane contains Mercury's centered magnetic dipole axis), and Y (completes the right-hand set)
 	</Description>
       <Contact>
-        <PersonID>spase://CNES/Person/Norman.F.Ness</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Norman.F.Ness</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>
       <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Mariner10/MAG/m10-mag-m1mean6s.xml b/NumericalData/CDPP-AMDA/Mariner10/MAG/m10-mag-m1mean6s.xml
index 6af4585..6a60628 100644
--- a/NumericalData/CDPP-AMDA/Mariner10/MAG/m10-mag-m1mean6s.xml
+++ b/NumericalData/CDPP-AMDA/Mariner10/MAG/m10-mag-m1mean6s.xml
@@ -14,7 +14,7 @@
 
      </Description>
       <Contact>
-        <PersonID>spase://CNES/Person/Norman.F.Ness</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Norman.F.Ness</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>
       <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Mariner10/MAG/m10-mag-m2mean6s.xml b/NumericalData/CDPP-AMDA/Mariner10/MAG/m10-mag-m2mean6s.xml
index 021821e..05cea75 100644
--- a/NumericalData/CDPP-AMDA/Mariner10/MAG/m10-mag-m2mean6s.xml
+++ b/NumericalData/CDPP-AMDA/Mariner10/MAG/m10-mag-m2mean6s.xml
@@ -11,7 +11,7 @@
 	      * SEQ : unreferenced/ambiguous definition (center = Sun) - feedback welcome.
       </Description>
       <Contact>
-        <PersonID>spase://CNES/Person/Norman.F.Ness</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Norman.F.Ness</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>
       <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Mariner10/MAG/m10-mag-m3highres.xml b/NumericalData/CDPP-AMDA/Mariner10/MAG/m10-mag-m3highres.xml
index 754ecbc..48f05ff 100644
--- a/NumericalData/CDPP-AMDA/Mariner10/MAG/m10-mag-m3highres.xml
+++ b/NumericalData/CDPP-AMDA/Mariner10/MAG/m10-mag-m3highres.xml
@@ -11,7 +11,7 @@
 	      * MSO : X (Mercury to Sun), Z (X-Z plane contains Mercury's centered magnetic dipole axis), and Y (completes the right-hand set)     
       </Description>
       <Contact>
-        <PersonID>spase://CNES/Person/Norman.F.Ness</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Norman.F.Ness</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>
       <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Mariner10/MAG/m10-mag-m3mean6s.xml b/NumericalData/CDPP-AMDA/Mariner10/MAG/m10-mag-m3mean6s.xml
index b554194..862b01c 100644
--- a/NumericalData/CDPP-AMDA/Mariner10/MAG/m10-mag-m3mean6s.xml
+++ b/NumericalData/CDPP-AMDA/Mariner10/MAG/m10-mag-m3mean6s.xml
@@ -11,7 +11,7 @@
 	      * MSO : X (Mercury to Sun), Z (X-Z plane contains Mercury's centered magnetic dipole axis), and Y (completes the right-hand set)
       </Description>
       <Contact>
-        <PersonID>spase://CNES/Person/Norman.F.Ness</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Norman.F.Ness</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>
       <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Mariner10/PLS/m10-pls-m1count.xml b/NumericalData/CDPP-AMDA/Mariner10/PLS/m10-pls-m1count.xml
index 094decb..c29c76b 100644
--- a/NumericalData/CDPP-AMDA/Mariner10/PLS/m10-pls-m1count.xml
+++ b/NumericalData/CDPP-AMDA/Mariner10/PLS/m10-pls-m1count.xml
@@ -17,7 +17,7 @@ was 6.5 degrees east of the spacecraft-sun line. The field of view is
 		 that plane [OGILVIEETAL1974]
 	 </Description>
          <Contact>
-                <PersonID>spase://CNES/Person/Norman.F.Ness</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Norman.F.Ness</PersonID>
                 <Role>PrincipalInvestigator</Role>
          </Contact>
          <Association>
diff --git a/NumericalData/CDPP-AMDA/Mariner10/PLS/m10-pls-m1mom.xml b/NumericalData/CDPP-AMDA/Mariner10/PLS/m10-pls-m1mom.xml
index c3ba8a4..60be4ed 100644
--- a/NumericalData/CDPP-AMDA/Mariner10/PLS/m10-pls-m1mom.xml
+++ b/NumericalData/CDPP-AMDA/Mariner10/PLS/m10-pls-m1mom.xml
@@ -13,7 +13,7 @@ to the distribution halo, and two cores, plus a moment estimate. If the
 distribution does not have a halo, or only has a single core, then the        
 halo or core2 columns will contain missing data flags.</Description>
             <Contact>
-                <PersonID>spase://CNES/Person/Norman.F.Ness</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Norman.F.Ness</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <Association>
diff --git a/NumericalData/CDPP-AMDA/Mariner10/PLS/m10-pls-m2count.xml b/NumericalData/CDPP-AMDA/Mariner10/PLS/m10-pls-m2count.xml
index 03315b8..16aceef 100644
--- a/NumericalData/CDPP-AMDA/Mariner10/PLS/m10-pls-m2count.xml
+++ b/NumericalData/CDPP-AMDA/Mariner10/PLS/m10-pls-m2count.xml
@@ -17,7 +17,7 @@ was 6.5 degrees east of the spacecraft-sun line. The field of view is
 		 that plane [OGILVIEETAL1974]
 	 </Description>
          <Contact>
-                <PersonID>spase://CNES/Person/Norman.F.Ness</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Norman.F.Ness</PersonID>
                 <Role>PrincipalInvestigator</Role>
          </Contact>
          <Association>
diff --git a/NumericalData/CDPP-AMDA/Mariner10/PLS/m10-pls-m2mom.xml b/NumericalData/CDPP-AMDA/Mariner10/PLS/m10-pls-m2mom.xml
index 308b58e..6a52e45 100644
--- a/NumericalData/CDPP-AMDA/Mariner10/PLS/m10-pls-m2mom.xml
+++ b/NumericalData/CDPP-AMDA/Mariner10/PLS/m10-pls-m2mom.xml
@@ -14,7 +14,7 @@ distribution does not have a halo, or only has a single core, then the
 		    halo or core2 columns will contain missing data flags.
     </Description>
             <Contact>
-                <PersonID>spase://CNES/Person/Norman.F.Ness</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Norman.F.Ness</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <Association>
diff --git a/NumericalData/CDPP-AMDA/Mariner10/PLS/m10-pls-m3count.xml b/NumericalData/CDPP-AMDA/Mariner10/PLS/m10-pls-m3count.xml
index abdf348..9d301c7 100644
--- a/NumericalData/CDPP-AMDA/Mariner10/PLS/m10-pls-m3count.xml
+++ b/NumericalData/CDPP-AMDA/Mariner10/PLS/m10-pls-m3count.xml
@@ -16,7 +16,7 @@ was 6.5 degrees east of the spacecraft-sun line. The field of view is
 +/- 3.5 degrees in the scan plane and +/- 13.5 degrees perpendicular to       
 that plane [OGILVIEETAL1974]. </Description>
             <Contact>
-                <PersonID>spase://CNES/Person/Norman.F.Ness</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Norman.F.Ness</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <Association>
diff --git a/NumericalData/CDPP-AMDA/Mariner10/PLS/m10-pls-m3mom.xml b/NumericalData/CDPP-AMDA/Mariner10/PLS/m10-pls-m3mom.xml
index c5e6681..f0b73f5 100644
--- a/NumericalData/CDPP-AMDA/Mariner10/PLS/m10-pls-m3mom.xml
+++ b/NumericalData/CDPP-AMDA/Mariner10/PLS/m10-pls-m3mom.xml
@@ -14,7 +14,7 @@ distribution does not have a halo, or only has a single core, then the
 		    halo or core2 columns will contain missing data flags.
     </Description>
             <Contact>
-                <PersonID>spase://CNES/Person/Norman.F.Ness</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Norman.F.Ness</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <Association>
diff --git a/NumericalData/CDPP-AMDA/POLAR/Hydra/plr-hyd-h0.xml b/NumericalData/CDPP-AMDA/POLAR/Hydra/plr-hyd-h0.xml
index 9c5f06a..10db0ba 100644
--- a/NumericalData/CDPP-AMDA/POLAR/Hydra/plr-hyd-h0.xml
+++ b/NumericalData/CDPP-AMDA/POLAR/Hydra/plr-hyd-h0.xml
@@ -9,7 +9,7 @@
             <ReleaseDate>2020-07-07T21:15:02Z</ReleaseDate>
             <Description>Polar HYDRA 13.8 sec ion and electron fluxes, 12.5 eV - 18.3 keV, 29 energy channels</Description>
             <Contact>
-                <PersonID>spase://CNES/Person/Jack.D.Scudder</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Jack.D.Scudder</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             
diff --git a/NumericalData/CDPP-AMDA/POLAR/Hydra/plr-hyd-mom.xml b/NumericalData/CDPP-AMDA/POLAR/Hydra/plr-hyd-mom.xml
index c4ceb79..4a9d701 100644
--- a/NumericalData/CDPP-AMDA/POLAR/Hydra/plr-hyd-mom.xml
+++ b/NumericalData/CDPP-AMDA/POLAR/Hydra/plr-hyd-mom.xml
@@ -18,7 +18,7 @@
                 be available from the P.I.
             </Description>
             <Contact>
-                <PersonID>spase://CNES/Person/Jack.D.Scudder</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Jack.D.Scudder</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/POLAR/Models/plr-msph-models.xml b/NumericalData/CDPP-AMDA/POLAR/Models/plr-msph-models.xml
index b034499..60b7014 100644
--- a/NumericalData/CDPP-AMDA/POLAR/Models/plr-msph-models.xml
+++ b/NumericalData/CDPP-AMDA/POLAR/Models/plr-msph-models.xml
@@ -12,7 +12,7 @@
          </Description>
          <Acknowledgement>TBD</Acknowledgement> 
          <Contact>
-            <PersonID>spase://CNES/Person/Christian.Jacquey</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Christian.Jacquey</PersonID>
             <Role>TechnicalContact</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/POLAR/Models/plr-t96-model.xml b/NumericalData/CDPP-AMDA/POLAR/Models/plr-t96-model.xml
index 27adb42..b655a7e 100644
--- a/NumericalData/CDPP-AMDA/POLAR/Models/plr-t96-model.xml
+++ b/NumericalData/CDPP-AMDA/POLAR/Models/plr-t96-model.xml
@@ -15,7 +15,7 @@
          </Description>
          <Acknowledgement>TBD</Acknowledgement> 
          <Contact>
-         <PersonID>spase://CNES/Person/Nikolai.Tsyganenko</PersonID>
+         <PersonID>spase://CNES/Person/CDPP-AMDA/Nikolai.Tsyganenko</PersonID>
             <Role>PrincipalInvestigator</Role>
          </Contact>            
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/PSP/MAG/psp-mag-1min.xml b/NumericalData/CDPP-AMDA/PSP/MAG/psp-mag-1min.xml
index cafe5de..9d69abd 100644
--- a/NumericalData/CDPP-AMDA/PSP/MAG/psp-mag-1min.xml
+++ b/NumericalData/CDPP-AMDA/PSP/MAG/psp-mag-1min.xml
@@ -12,7 +12,7 @@
          <Acknowledgement>
          </Acknowledgement>
          <Contact>
-           <PersonID>spase://SMWG/Person/Stuart.D.Bale </PersonID>
+           <PersonID>spase://SMWG/Person/Stuart.D.Bale</PersonID>
            <Role>PrincipalInvestigator</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/PSP/MAG/psp-mag-4cyc.xml b/NumericalData/CDPP-AMDA/PSP/MAG/psp-mag-4cyc.xml
index 0f87cc1..ca9a757 100644
--- a/NumericalData/CDPP-AMDA/PSP/MAG/psp-mag-4cyc.xml
+++ b/NumericalData/CDPP-AMDA/PSP/MAG/psp-mag-4cyc.xml
@@ -14,7 +14,7 @@
          <Acknowledgement>
          </Acknowledgement>
          <Contact>
-           <PersonID>spase://SMWG/Person/Stuart.D.Bale </PersonID>
+           <PersonID>spase://SMWG/Person/Stuart.D.Bale</PersonID>
            <Role>PrincipalInvestigator</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/PSP/MAG/psp-mag-vflyby1.xml b/NumericalData/CDPP-AMDA/PSP/MAG/psp-mag-vflyby1.xml
index 8f9e1f1..fc0bfe7 100644
--- a/NumericalData/CDPP-AMDA/PSP/MAG/psp-mag-vflyby1.xml
+++ b/NumericalData/CDPP-AMDA/PSP/MAG/psp-mag-vflyby1.xml
@@ -12,7 +12,7 @@
          <Acknowledgement>
          </Acknowledgement>
          <Contact>
-           <PersonID>spase://SMWG/Person/Stuart.D.Bale </PersonID>
+           <PersonID>spase://SMWG/Person/Stuart.D.Bale</PersonID>
            <Role>PrincipalInvestigator</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/PSP/MAG/psp-mag-vflyby2.xml b/NumericalData/CDPP-AMDA/PSP/MAG/psp-mag-vflyby2.xml
index 52380d7..d830cfd 100644
--- a/NumericalData/CDPP-AMDA/PSP/MAG/psp-mag-vflyby2.xml
+++ b/NumericalData/CDPP-AMDA/PSP/MAG/psp-mag-vflyby2.xml
@@ -12,7 +12,7 @@
          <Acknowledgement>
          </Acknowledgement>
          <Contact>
-           <PersonID>spase://SMWG/Person/Stuart.D.Bale </PersonID>
+           <PersonID>spase://SMWG/Person/Stuart.D.Bale</PersonID>
            <Role>PrincipalInvestigator</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/PSP/MAG/psp-mag-vflyby3.xml b/NumericalData/CDPP-AMDA/PSP/MAG/psp-mag-vflyby3.xml
index 85772c7..84119cd 100644
--- a/NumericalData/CDPP-AMDA/PSP/MAG/psp-mag-vflyby3.xml
+++ b/NumericalData/CDPP-AMDA/PSP/MAG/psp-mag-vflyby3.xml
@@ -12,7 +12,7 @@
          <Acknowledgement>
          </Acknowledgement>
          <Contact>
-           <PersonID>spase://SMWG/Person/Stuart.D.Bale </PersonID>
+           <PersonID>spase://SMWG/Person/Stuart.D.Bale</PersonID>
            <Role>PrincipalInvestigator</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/PSP/MAG/psp-mag-vflyby4.xml b/NumericalData/CDPP-AMDA/PSP/MAG/psp-mag-vflyby4.xml
index ae86ef9..dfa8935 100644
--- a/NumericalData/CDPP-AMDA/PSP/MAG/psp-mag-vflyby4.xml
+++ b/NumericalData/CDPP-AMDA/PSP/MAG/psp-mag-vflyby4.xml
@@ -12,7 +12,7 @@
          <Acknowledgement>
          </Acknowledgement>
          <Contact>
-           <PersonID>spase://SMWG/Person/Stuart.D.Bale </PersonID>
+           <PersonID>spase://SMWG/Person/Stuart.D.Bale</PersonID>
            <Role>PrincipalInvestigator</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/PSP/ORBIT/psp-orb-all.xml b/NumericalData/CDPP-AMDA/PSP/ORBIT/psp-orb-all.xml
index 45751cf..54f1bd7 100644
--- a/NumericalData/CDPP-AMDA/PSP/ORBIT/psp-orb-all.xml
+++ b/NumericalData/CDPP-AMDA/PSP/ORBIT/psp-orb-all.xml
@@ -9,7 +9,7 @@
          <ReleaseDate>2018-10-12T10:48:29Z</ReleaseDate> 
          <Description>Reconstructed and predicted ephemeris for Parker Solar Probe</Description>
          <Contact>
-            <PersonID>spase://CNES/Person/NAIF</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/NAIF</PersonID>
             <Role>PrincipalInvestigator</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/PSP/ORBIT/psp-orb-venus1.xml b/NumericalData/CDPP-AMDA/PSP/ORBIT/psp-orb-venus1.xml
index 7fcdc85..20ad273 100644
--- a/NumericalData/CDPP-AMDA/PSP/ORBIT/psp-orb-venus1.xml
+++ b/NumericalData/CDPP-AMDA/PSP/ORBIT/psp-orb-venus1.xml
@@ -9,7 +9,7 @@
             <ReleaseDate>2021-07-13T00:00:00Z</ReleaseDate>
             <Description>Calculated in IRAP by using PSP SPICE kernels</Description>
             <Contact>
-                <PersonID>spase://CNES/Person/Benjamin.Renard</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Benjamin.Renard</PersonID>
                 <Role>DataProducer</Role>
             </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/PSP/ORBIT/psp-orb-venus2.xml b/NumericalData/CDPP-AMDA/PSP/ORBIT/psp-orb-venus2.xml
index 37fc56d..7e46f8b 100644
--- a/NumericalData/CDPP-AMDA/PSP/ORBIT/psp-orb-venus2.xml
+++ b/NumericalData/CDPP-AMDA/PSP/ORBIT/psp-orb-venus2.xml
@@ -9,7 +9,7 @@
             <ReleaseDate>2021-07-13T00:00:00Z</ReleaseDate>
             <Description>Calculated in IRAP by using PSP SPICE kernels</Description>
             <Contact>
-                <PersonID>spase://CNES/Person/Benjamin.Renard</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Benjamin.Renard</PersonID>
                 <Role>DataProducer</Role>
             </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/PSP/ORBIT/psp-orb-venus3.xml b/NumericalData/CDPP-AMDA/PSP/ORBIT/psp-orb-venus3.xml
index ced765c..100c0de 100644
--- a/NumericalData/CDPP-AMDA/PSP/ORBIT/psp-orb-venus3.xml
+++ b/NumericalData/CDPP-AMDA/PSP/ORBIT/psp-orb-venus3.xml
@@ -9,7 +9,7 @@
             <ReleaseDate>2021-07-13T00:00:00Z</ReleaseDate>
             <Description>Calculated in IRAP by using PSP SPICE kernels</Description>
             <Contact>
-                <PersonID>spase://CNES/Person/Benjamin.Renard</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Benjamin.Renard</PersonID>
                 <Role>DataProducer</Role>
             </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/PSP/ORBIT/psp-orb-venus4.xml b/NumericalData/CDPP-AMDA/PSP/ORBIT/psp-orb-venus4.xml
index 68170c4..2825a48 100644
--- a/NumericalData/CDPP-AMDA/PSP/ORBIT/psp-orb-venus4.xml
+++ b/NumericalData/CDPP-AMDA/PSP/ORBIT/psp-orb-venus4.xml
@@ -9,7 +9,7 @@
             <ReleaseDate>2021-07-13T00:00:00Z</ReleaseDate>
             <Description>Calculated in IRAP by using PSP SPICE kernels</Description>
             <Contact>
-                <PersonID>spase://CNES/Person/Benjamin.Renard</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Benjamin.Renard</PersonID>
                 <Role>DataProducer</Role>
             </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/PSP/psp-fld-qfl.xml b/NumericalData/CDPP-AMDA/PSP/psp-fld-qfl.xml
index a48268e..ea18aa0 100644
--- a/NumericalData/CDPP-AMDA/PSP/psp-fld-qfl.xml
+++ b/NumericalData/CDPP-AMDA/PSP/psp-fld-qfl.xml
@@ -23,7 +23,7 @@
          <Acknowledgement>
          </Acknowledgement>
          <Contact>
-           <PersonID>spase://SMWG/Person/Stuart.D.Bale </PersonID>
+           <PersonID>spase://SMWG/Person/Stuart.D.Bale</PersonID>
            <Role>PrincipalInvestigator</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Phobos2/ASPERA/pho-asp-el.xml b/NumericalData/CDPP-AMDA/Phobos2/ASPERA/pho-asp-el.xml
index 4fb929a..ee4210d 100644
--- a/NumericalData/CDPP-AMDA/Phobos2/ASPERA/pho-asp-el.xml
+++ b/NumericalData/CDPP-AMDA/Phobos2/ASPERA/pho-asp-el.xml
@@ -8,7 +8,7 @@
             <ReleaseDate>2017-01-01T09:41:00</ReleaseDate>
             <Description></Description>             
             <Contact>
-                <PersonID>spase://CNES/Person/Elena.Budnik</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Elena.Budnik</PersonID>
                 <Role>GeneralContact</Role>
             </Contact>
             <InformationURL/>                           
diff --git a/NumericalData/CDPP-AMDA/Phobos2/ASPERA/pho-asp-ion.xml b/NumericalData/CDPP-AMDA/Phobos2/ASPERA/pho-asp-ion.xml
index a5db667..5ee2f9d 100644
--- a/NumericalData/CDPP-AMDA/Phobos2/ASPERA/pho-asp-ion.xml
+++ b/NumericalData/CDPP-AMDA/Phobos2/ASPERA/pho-asp-ion.xml
@@ -8,7 +8,7 @@
             <ReleaseDate>2017-01-01T09:41:00</ReleaseDate>
             <Description></Description>             
             <Contact>
-                <PersonID>spase://CNES/Person/Elena.Budnik</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Elena.Budnik</PersonID>
                 <Role>GeneralContact</Role>
             </Contact>
             <InformationURL/>                           
diff --git a/NumericalData/CDPP-AMDA/Phobos2/ephemeris/pho-orb-mso.xml b/NumericalData/CDPP-AMDA/Phobos2/ephemeris/pho-orb-mso.xml
index 469f334..0a4fbf0 100644
--- a/NumericalData/CDPP-AMDA/Phobos2/ephemeris/pho-orb-mso.xml
+++ b/NumericalData/CDPP-AMDA/Phobos2/ephemeris/pho-orb-mso.xml
@@ -8,7 +8,7 @@
             <ReleaseDate>2015-10-12T10:46:00</ReleaseDate>
             <Description>SPICE kernel used was created by Institute of Applied Math (Moscow)</Description>  
             <Contact>
-                <PersonID>spase://CNES/Person/NAIF</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/NAIF</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
         </ResourceHeader>
diff --git a/NumericalData/CDPP-AMDA/Planets/Earth/earth-info-mag.xml b/NumericalData/CDPP-AMDA/Planets/Earth/earth-info-mag.xml
index 601cdcc..919d747 100644
--- a/NumericalData/CDPP-AMDA/Planets/Earth/earth-info-mag.xml
+++ b/NumericalData/CDPP-AMDA/Planets/Earth/earth-info-mag.xml
@@ -21,11 +21,11 @@
             Earth dipole tilt and roll angles are calculated with the use of GEOPACK-2008 package.</Description>
          <Acknowledgement>TBD</Acknowledgement>
          <Contact>
-            <PersonID>spase://CNES/Person/Nikolai.Tsyganenko</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Nikolai.Tsyganenko</PersonID>
             <Role>PrincipalInvestigator</Role>
          </Contact> 
          <Contact>
-            <PersonID>spase://CNES/Person/Christian.Jacquey</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Christian.Jacquey</PersonID>
             <Role>TechnicalContact</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Rosetta/AUX/ros-aux-all.xml b/NumericalData/CDPP-AMDA/Rosetta/AUX/ros-aux-all.xml
index 37a6884..77ddf8a 100644
--- a/NumericalData/CDPP-AMDA/Rosetta/AUX/ros-aux-all.xml
+++ b/NumericalData/CDPP-AMDA/Rosetta/AUX/ros-aux-all.xml
@@ -9,7 +9,7 @@
          <Description/>                                
          <Acknowledgement/>                     
          <Contact>       
-        <PersonID>spase://CNES/Person/L.Foldy</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/L.Foldy</PersonID>
         <Role>TechnicalContact</Role>
       </Contact>
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Rosetta/Ephemeris/ros-orb-comet.xml b/NumericalData/CDPP-AMDA/Rosetta/Ephemeris/ros-orb-comet.xml
index c59b9c2..8140bca 100644
--- a/NumericalData/CDPP-AMDA/Rosetta/Ephemeris/ros-orb-comet.xml
+++ b/NumericalData/CDPP-AMDA/Rosetta/Ephemeris/ros-orb-comet.xml
@@ -63,7 +63,7 @@
    The orientation of this frame is computed by evaluating 
    corresponding C_G comet attitudes kernels.</Description>
       <Contact>
-        <PersonID>spase://CNES/Person/Elena.Budnik</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Elena.Budnik</PersonID>
         <Role>DataProducer</Role>
       </Contact>
     </ResourceHeader>
diff --git a/NumericalData/CDPP-AMDA/Rosetta/Ephemeris/ros-orb-cruise.xml b/NumericalData/CDPP-AMDA/Rosetta/Ephemeris/ros-orb-cruise.xml
index 2eeeacd..a6e5a24 100644
--- a/NumericalData/CDPP-AMDA/Rosetta/Ephemeris/ros-orb-cruise.xml
+++ b/NumericalData/CDPP-AMDA/Rosetta/Ephemeris/ros-orb-cruise.xml
@@ -12,7 +12,7 @@
         * HEEQ (Heliocentric Earth Equatorial Frame) : All vectors are geometric: no aberration corrections are used. The solar rotation axis is the primary vector: the Z axis points in the solar north direction. The position of the Sun relative to the Earth is the secondary vector: the X axis is the component of this position vectororthogonal to the Z axis. The Y axis is Z cross X, completing the right-handed reference frame.
      </Description>
       <Contact>
-        <PersonID>spase://CNES/Person/Elena.Budnik</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Elena.Budnik</PersonID>
         <Role>TechnicalContact</Role>
       </Contact>
     </ResourceHeader>
diff --git a/NumericalData/CDPP-AMDA/Rosetta/Ephemeris/sun-pol-cgck.xml b/NumericalData/CDPP-AMDA/Rosetta/Ephemeris/sun-pol-cgck.xml
index e314f1b..781db5e 100644
--- a/NumericalData/CDPP-AMDA/Rosetta/Ephemeris/sun-pol-cgck.xml
+++ b/NumericalData/CDPP-AMDA/Rosetta/Ephemeris/sun-pol-cgck.xml
@@ -23,7 +23,7 @@
    The orientation of this frame is computed by evaluating
    corresponding C_G comet attitudes kernels.</Description>
       <Contact>
-        <PersonID>spase://CNES/Person/Elena.Budnik</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Elena.Budnik</PersonID>
         <Role>DataProducer</Role>
       </Contact>
     </ResourceHeader>
diff --git a/NumericalData/CDPP-AMDA/Rosetta/IES/ros-elc-az.xml b/NumericalData/CDPP-AMDA/Rosetta/IES/ros-elc-az.xml
index adda1f9..5faf111 100644
--- a/NumericalData/CDPP-AMDA/Rosetta/IES/ros-elc-az.xml
+++ b/NumericalData/CDPP-AMDA/Rosetta/IES/ros-elc-az.xml
@@ -27,15 +27,15 @@
          </Description>
          <Acknowledgement>Principal Investigator : James L. Burch, SwRI</Acknowledgement>
          <Contact>
-            <PersonID>spase://CNES/Person/James.L.Burch</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/James.L.Burch</PersonID>
             <Role>PrincipalInvestigator</Role>
          </Contact>
          <Contact>
-            <PersonID>spase://CNES/Person/Ray.Goldstein</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Ray.Goldstein</PersonID>
             <Role>CoInvestigator</Role>
          </Contact>
          <Contact>
-            <PersonID>spase://CNES/Person/Brad.Trantham</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Brad.Trantham</PersonID>
             <Role>DataProducer</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Rosetta/IES/ros-elc-azimuth.xml b/NumericalData/CDPP-AMDA/Rosetta/IES/ros-elc-azimuth.xml
index 7a3017a..9059621 100644
--- a/NumericalData/CDPP-AMDA/Rosetta/IES/ros-elc-azimuth.xml
+++ b/NumericalData/CDPP-AMDA/Rosetta/IES/ros-elc-azimuth.xml
@@ -27,15 +27,15 @@
          </Description>
          <Acknowledgement>Principal Investigator : James L. Burch, SwRI</Acknowledgement>
          <Contact>
-            <PersonID>spase://CNES/Person/James.L.Burch</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/James.L.Burch</PersonID>
             <Role>PrincipalInvestigator</Role>
          </Contact>
          <Contact>
-            <PersonID>spase://CNES/Person/Ray.Goldstein</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Ray.Goldstein</PersonID>
             <Role>CoInvestigator</Role>
          </Contact>
          <Contact>
-            <PersonID>spase://CNES/Person/Brad.Trantham</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Brad.Trantham</PersonID>
             <Role>DataProducer</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Rosetta/IES/ros-elc-elev.xml b/NumericalData/CDPP-AMDA/Rosetta/IES/ros-elc-elev.xml
index 0e8e67a..27ac060 100644
--- a/NumericalData/CDPP-AMDA/Rosetta/IES/ros-elc-elev.xml
+++ b/NumericalData/CDPP-AMDA/Rosetta/IES/ros-elc-elev.xml
@@ -10,15 +10,15 @@
          <Description>Electron elevation spectra : differential energy fluxes summed over energies and azimuths</Description>
          <Acknowledgement>Principal Investigator : James L. Burch, SwRI</Acknowledgement>
          <Contact>
-            <PersonID>spase://CNES/Person/James.L.Burch</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/James.L.Burch</PersonID>
             <Role>PrincipalInvestigator</Role>
          </Contact>
          <Contact>
-            <PersonID>spase://CNES/Person/Ray.Goldstein</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Ray.Goldstein</PersonID>
             <Role>CoInvestigator</Role>
          </Contact>
          <Contact>
-            <PersonID>spase://CNES/Person/Brad.Trantham</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Brad.Trantham</PersonID>
             <Role>DataProducer</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Rosetta/IES/ros-elc-elv.xml b/NumericalData/CDPP-AMDA/Rosetta/IES/ros-elc-elv.xml
index 91cf289..7e596dd 100644
--- a/NumericalData/CDPP-AMDA/Rosetta/IES/ros-elc-elv.xml
+++ b/NumericalData/CDPP-AMDA/Rosetta/IES/ros-elc-elv.xml
@@ -10,15 +10,15 @@
          <Description>Electron elevation spectra : countrates summed over energies and azimuths</Description>
          <Acknowledgement>Principal Investigator : James L. Burch, SwRI</Acknowledgement>
          <Contact>
-            <PersonID>spase://CNES/Person/James.L.Burch</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/James.L.Burch</PersonID>
             <Role>PrincipalInvestigator</Role>
          </Contact>
          <Contact>
-            <PersonID>spase://CNES/Person/Ray.Goldstein</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Ray.Goldstein</PersonID>
             <Role>CoInvestigator</Role>
          </Contact>
          <Contact>
-            <PersonID>spase://CNES/Person/Brad.Trantham</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Brad.Trantham</PersonID>
             <Role>DataProducer</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Rosetta/IES/ros-elc-en.xml b/NumericalData/CDPP-AMDA/Rosetta/IES/ros-elc-en.xml
index 82be9fe..9b5b47d 100644
--- a/NumericalData/CDPP-AMDA/Rosetta/IES/ros-elc-en.xml
+++ b/NumericalData/CDPP-AMDA/Rosetta/IES/ros-elc-en.xml
@@ -10,15 +10,15 @@
          <Description>Electron energy spectra : countrates summed over azimuths and elevations</Description>
          <Acknowledgement>Principal Investigator : James L. Burch, SwRI</Acknowledgement>
          <Contact>
-            <PersonID>spase://CNES/Person/James.L.Burch</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/James.L.Burch</PersonID>
             <Role>PrincipalInvestigator</Role>
          </Contact>
          <Contact>
-            <PersonID>spase://CNES/Person/Ray.Goldstein</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Ray.Goldstein</PersonID>
             <Role>CoInvestigator</Role>
          </Contact>
          <Contact>
-            <PersonID>spase://CNES/Person/Brad.Trantham</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Brad.Trantham</PersonID>
             <Role>DataProducer</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Rosetta/IES/ros-elc-energy.xml b/NumericalData/CDPP-AMDA/Rosetta/IES/ros-elc-energy.xml
index f18bd83..65475b0 100644
--- a/NumericalData/CDPP-AMDA/Rosetta/IES/ros-elc-energy.xml
+++ b/NumericalData/CDPP-AMDA/Rosetta/IES/ros-elc-energy.xml
@@ -10,15 +10,15 @@
          <Description>Electron energy spectra : differential energy fluxes summed over azimuths and elevations</Description>
          <Acknowledgement>Principal Investigator : James L. Burch, SwRI</Acknowledgement>
          <Contact>
-            <PersonID>spase://CNES/Person/James.L.Burch</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/James.L.Burch</PersonID>
             <Role>PrincipalInvestigator</Role>
          </Contact>
          <Contact>
-            <PersonID>spase://CNES/Person/Ray.Goldstein</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Ray.Goldstein</PersonID>
             <Role>CoInvestigator</Role>
          </Contact>
          <Contact>
-            <PersonID>spase://CNES/Person/Brad.Trantham</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Brad.Trantham</PersonID>
             <Role>DataProducer</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Rosetta/IES/ros-ion-az.xml b/NumericalData/CDPP-AMDA/Rosetta/IES/ros-ion-az.xml
index 42f5818..ed45dcf 100644
--- a/NumericalData/CDPP-AMDA/Rosetta/IES/ros-ion-az.xml
+++ b/NumericalData/CDPP-AMDA/Rosetta/IES/ros-ion-az.xml
@@ -27,15 +27,15 @@
          </Description>
          <Acknowledgement>Principal Investigator : James L. Burch, SwRI</Acknowledgement>
          <Contact>
-            <PersonID>spase://CNES/Person/James.L.Burch</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/James.L.Burch</PersonID>
             <Role>PrincipalInvestigator</Role>
          </Contact>
          <Contact>
-            <PersonID>spase://CNES/Person/Ray.Goldstein</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Ray.Goldstein</PersonID>
             <Role>CoInvestigator</Role>
          </Contact>
          <Contact>
-            <PersonID>spase://CNES/Person/Brad.Trantham</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Brad.Trantham</PersonID>
             <Role>DataProducer</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Rosetta/IES/ros-ion-azimuth.xml b/NumericalData/CDPP-AMDA/Rosetta/IES/ros-ion-azimuth.xml
index e6f96aa..31c754f 100644
--- a/NumericalData/CDPP-AMDA/Rosetta/IES/ros-ion-azimuth.xml
+++ b/NumericalData/CDPP-AMDA/Rosetta/IES/ros-ion-azimuth.xml
@@ -27,15 +27,15 @@
          </Description>
          <Acknowledgement>Principal Investigator : James L. Burch, SwRI</Acknowledgement>
          <Contact>
-            <PersonID>spase://CNES/Person/James.L.Burch</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/James.L.Burch</PersonID>
             <Role>PrincipalInvestigator</Role>
          </Contact>
          <Contact>
-            <PersonID>spase://CNES/Person/Ray.Goldstein</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Ray.Goldstein</PersonID>
             <Role>CoInvestigator</Role>
          </Contact>
          <Contact>
-            <PersonID>spase://CNES/Person/Brad.Trantham</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Brad.Trantham</PersonID>
             <Role>DataProducer</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Rosetta/IES/ros-ion-elev.xml b/NumericalData/CDPP-AMDA/Rosetta/IES/ros-ion-elev.xml
index a866f9d..93ae770 100644
--- a/NumericalData/CDPP-AMDA/Rosetta/IES/ros-ion-elev.xml
+++ b/NumericalData/CDPP-AMDA/Rosetta/IES/ros-ion-elev.xml
@@ -10,15 +10,15 @@
          <Description>Ion elevation spectra :  differential energy flux summed over energies and azimuths. </Description>
          <Acknowledgement>Principal Investigator : James L. Burch, SwRI</Acknowledgement>
          <Contact>
-            <PersonID>spase://CNES/Person/James.L.Burch</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/James.L.Burch</PersonID>
             <Role>PrincipalInvestigator</Role>
          </Contact>
          <Contact>
-            <PersonID>spase://CNES/Person/Ray.Goldstein</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Ray.Goldstein</PersonID>
             <Role>CoInvestigator</Role>
          </Contact>
          <Contact>
-            <PersonID>spase://CNES/Person/Brad.Trantham</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Brad.Trantham</PersonID>
             <Role>DataProducer</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Rosetta/IES/ros-ion-elv.xml b/NumericalData/CDPP-AMDA/Rosetta/IES/ros-ion-elv.xml
index 0be7d53..832bf9d 100644
--- a/NumericalData/CDPP-AMDA/Rosetta/IES/ros-ion-elv.xml
+++ b/NumericalData/CDPP-AMDA/Rosetta/IES/ros-ion-elv.xml
@@ -10,15 +10,15 @@
          <Description>Ion elevation spectra : countrate summed over energies and azimuths</Description>
          <Acknowledgement>Principal Investigator : James L. Burch, SwRI</Acknowledgement>
          <Contact>
-            <PersonID>spase://CNES/Person/James.L.Burch</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/James.L.Burch</PersonID>
             <Role>PrincipalInvestigator</Role>
          </Contact>
          <Contact>
-            <PersonID>spase://CNES/Person/Ray.Goldstein</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Ray.Goldstein</PersonID>
             <Role>CoInvestigator</Role>
          </Contact>
          <Contact>
-            <PersonID>spase://CNES/Person/Brad.Trantham</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Brad.Trantham</PersonID>
             <Role>DataProducer</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Rosetta/IES/ros-ion-en.xml b/NumericalData/CDPP-AMDA/Rosetta/IES/ros-ion-en.xml
index 6c649a1..9e96858 100644
--- a/NumericalData/CDPP-AMDA/Rosetta/IES/ros-ion-en.xml
+++ b/NumericalData/CDPP-AMDA/Rosetta/IES/ros-ion-en.xml
@@ -10,15 +10,15 @@
          <Description>Ion energy spectra : Counts summed over azimuths and elavations</Description>
          <Acknowledgement>Principal Investigator : James L. Burch, SwRI</Acknowledgement>
          <Contact>
-            <PersonID>spase://CNES/Person/James.L.Burch</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/James.L.Burch</PersonID>
             <Role>PrincipalInvestigator</Role>
          </Contact>
          <Contact>
-            <PersonID>spase://CNES/Person/Ray.Goldstein</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Ray.Goldstein</PersonID>
             <Role>CoInvestigator</Role>
          </Contact>
          <Contact>
-            <PersonID>spase://CNES/Person/Brad.Trantham</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Brad.Trantham</PersonID>
             <Role>DataProducer</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Rosetta/IES/ros-ion-energy.xml b/NumericalData/CDPP-AMDA/Rosetta/IES/ros-ion-energy.xml
index 49a216b..2ef50f1 100644
--- a/NumericalData/CDPP-AMDA/Rosetta/IES/ros-ion-energy.xml
+++ b/NumericalData/CDPP-AMDA/Rosetta/IES/ros-ion-energy.xml
@@ -10,15 +10,15 @@
          <Description>Ion energy spectra : differential energy flux summed over azimuths and elavations</Description>
          <Acknowledgement>Principal Investigator : James L. Burch, SwRI</Acknowledgement>
          <Contact>
-            <PersonID>spase://CNES/Person/James.L.Burch</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/James.L.Burch</PersonID>
             <Role>PrincipalInvestigator</Role>
          </Contact>
          <Contact>
-            <PersonID>spase://CNES/Person/Ray.Goldstein</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Ray.Goldstein</PersonID>
             <Role>CoInvestigator</Role>
          </Contact>
          <Contact>
-            <PersonID>spase://CNES/Person/Brad.Trantham</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Brad.Trantham</PersonID>
             <Role>DataProducer</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Rosetta/LAP/ros-lap-asw.xml b/NumericalData/CDPP-AMDA/Rosetta/LAP/ros-lap-asw.xml
index 281dffe..dcd7ef6 100644
--- a/NumericalData/CDPP-AMDA/Rosetta/LAP/ros-lap-asw.xml
+++ b/NumericalData/CDPP-AMDA/Rosetta/LAP/ros-lap-asw.xml
@@ -10,11 +10,11 @@
             <Description>Time series of sweep-based estimates of electron density, ion bulk speed, electron temperature, and photoelectron knee potential. Timestamps represent the middle of the corresponding sweeps.
             This is a preliminary data set which will be replaced by another in a few months.</Description>
             <Contact>       
-                <PersonID>spase://CNES/Person/Anders.Eriksson</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Anders.Eriksson</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <Contact>       
-                <PersonID>spase://CNES/Person/Erik.Johansson</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Erik.Johansson</PersonID>
                 <Role>DataProducer</Role>
             </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Rosetta/LAP/ros-lap-efl.xml b/NumericalData/CDPP-AMDA/Rosetta/LAP/ros-lap-efl.xml
index 82f1247..4c092cf 100644
--- a/NumericalData/CDPP-AMDA/Rosetta/LAP/ros-lap-efl.xml
+++ b/NumericalData/CDPP-AMDA/Rosetta/LAP/ros-lap-efl.xml
@@ -38,11 +38,11 @@ sounding rockets in the terrestrial ionosphere [Maynard, 1998].
 This is a preliminary data set which will be replaced by another in a few months.
 </Description>
             <Contact>       
-                <PersonID>spase://CNES/Person/Anders.Eriksson</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Anders.Eriksson</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <Contact>       
-                <PersonID>spase://CNES/Person/Erik.Johansson</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Erik.Johansson</PersonID>
                 <Role>DataProducer</Role>
             </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Rosetta/LAP/ros-lap-ned.xml b/NumericalData/CDPP-AMDA/Rosetta/LAP/ros-lap-ned.xml
index 4d7ca5f..f4ca29b 100644
--- a/NumericalData/CDPP-AMDA/Rosetta/LAP/ros-lap-ned.xml
+++ b/NumericalData/CDPP-AMDA/Rosetta/LAP/ros-lap-ned.xml
@@ -23,11 +23,11 @@ does not prevent plasma electrons from reaching the Langmuir probes.
 This is a preliminary data set which will be replaced by another in a few months.
  </Description>
             <Contact>       
-                <PersonID>spase://CNES/Person/Anders.Eriksson</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Anders.Eriksson</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <Contact>       
-                <PersonID>spase://CNES/Person/Erik.Johansson</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Erik.Johansson</PersonID>
                 <Role>DataProducer</Role>
             </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Rosetta/LAP/ros-lap-nel.xml b/NumericalData/CDPP-AMDA/Rosetta/LAP/ros-lap-nel.xml
index 3f6d11b..6c592a4 100644
--- a/NumericalData/CDPP-AMDA/Rosetta/LAP/ros-lap-nel.xml
+++ b/NumericalData/CDPP-AMDA/Rosetta/LAP/ros-lap-nel.xml
@@ -15,11 +15,11 @@ measurements or floating potential measurements on one probe.
 This is a preliminary data set which will be replaced by another in a few months.
             </Description>
             <Contact>       
-                <PersonID>spase://CNES/Person/Anders.Eriksson</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Anders.Eriksson</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <Contact>       
-                <PersonID>spase://CNES/Person/Erik.Johansson</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Erik.Johansson</PersonID>
                 <Role>DataProducer</Role>
             </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Rosetta/LAP/ros-lap-pho.xml b/NumericalData/CDPP-AMDA/Rosetta/LAP/ros-lap-pho.xml
index 7146ac9..302fd4b 100644
--- a/NumericalData/CDPP-AMDA/Rosetta/LAP/ros-lap-pho.xml
+++ b/NumericalData/CDPP-AMDA/Rosetta/LAP/ros-lap-pho.xml
@@ -32,11 +32,11 @@ though no other such effects have been noted on LAP1.
 This is a preliminary data set which will be replaced by another in a few months.
             </Description>
             <Contact>       
-                <PersonID>spase://CNES/Person/Anders.Eriksson</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Anders.Eriksson</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <Contact>       
-                <PersonID>spase://CNES/Person/Erik.Johansson</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Erik.Johansson</PersonID>
                 <Role>DataProducer</Role>
             </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Rosetta/LAP/ros-lap-usc.xml b/NumericalData/CDPP-AMDA/Rosetta/LAP/ros-lap-usc.xml
index a9377bf..f91a6b8 100644
--- a/NumericalData/CDPP-AMDA/Rosetta/LAP/ros-lap-usc.xml
+++ b/NumericalData/CDPP-AMDA/Rosetta/LAP/ros-lap-usc.xml
@@ -26,11 +26,11 @@
 This is a preliminary data set which will be replaced by another in a few months.            
             </Description>
             <Contact>       
-                <PersonID>spase://CNES/Person/Anders.Eriksson</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Anders.Eriksson</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <Contact>       
-                <PersonID>spase://CNES/Person/Erik.Johansson</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Erik.Johansson</PersonID>
                 <Role>DataProducer</Role>
             </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Rosetta/MAG/ros-magib-1s.xml b/NumericalData/CDPP-AMDA/Rosetta/MAG/ros-magib-1s.xml
index 82c7367..7d1415f 100644
--- a/NumericalData/CDPP-AMDA/Rosetta/MAG/ros-magib-1s.xml
+++ b/NumericalData/CDPP-AMDA/Rosetta/MAG/ros-magib-1s.xml
@@ -12,7 +12,7 @@
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/Ingo.Richter</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Ingo.Richter</PersonID>
                 <Role>DataProducer</Role>
             </Contact>
             <Association>
diff --git a/NumericalData/CDPP-AMDA/Rosetta/MAG/ros-magib-32s.xml b/NumericalData/CDPP-AMDA/Rosetta/MAG/ros-magib-32s.xml
index 82dbaa8..164a70a 100644
--- a/NumericalData/CDPP-AMDA/Rosetta/MAG/ros-magib-32s.xml
+++ b/NumericalData/CDPP-AMDA/Rosetta/MAG/ros-magib-32s.xml
@@ -12,7 +12,7 @@
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/Ingo.Richter</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Ingo.Richter</PersonID>
                 <Role>DataProducer</Role>
             </Contact>
             <Association>
diff --git a/NumericalData/CDPP-AMDA/Rosetta/MAG/ros-magib-rsmp.xml b/NumericalData/CDPP-AMDA/Rosetta/MAG/ros-magib-rsmp.xml
index f2a6c8f..2758281 100644
--- a/NumericalData/CDPP-AMDA/Rosetta/MAG/ros-magib-rsmp.xml
+++ b/NumericalData/CDPP-AMDA/Rosetta/MAG/ros-magib-rsmp.xml
@@ -12,7 +12,7 @@
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/Ingo.Richter</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Ingo.Richter</PersonID>
                 <Role>DataProducer</Role>
             </Contact>           
             <Association>
diff --git a/NumericalData/CDPP-AMDA/Rosetta/MAG/ros-magib-rsmp1s.xml b/NumericalData/CDPP-AMDA/Rosetta/MAG/ros-magib-rsmp1s.xml
index e1d85e7..fdbf95b 100644
--- a/NumericalData/CDPP-AMDA/Rosetta/MAG/ros-magib-rsmp1s.xml
+++ b/NumericalData/CDPP-AMDA/Rosetta/MAG/ros-magib-rsmp1s.xml
@@ -12,7 +12,7 @@
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/Ingo.Richter</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Ingo.Richter</PersonID>
                 <Role>DataProducer</Role>
             </Contact>
             <Association>
diff --git a/NumericalData/CDPP-AMDA/Rosetta/MAG/ros-magob-1s.xml b/NumericalData/CDPP-AMDA/Rosetta/MAG/ros-magob-1s.xml
index 6197084..0c8d83d 100644
--- a/NumericalData/CDPP-AMDA/Rosetta/MAG/ros-magob-1s.xml
+++ b/NumericalData/CDPP-AMDA/Rosetta/MAG/ros-magob-1s.xml
@@ -12,7 +12,7 @@
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/Ingo.Richter</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Ingo.Richter</PersonID>
                 <Role>DataProducer</Role>
             </Contact>
             <Association>
diff --git a/NumericalData/CDPP-AMDA/Rosetta/MAG/ros-magob-20hz.xml b/NumericalData/CDPP-AMDA/Rosetta/MAG/ros-magob-20hz.xml
index d7635a0..ecbc7c4 100644
--- a/NumericalData/CDPP-AMDA/Rosetta/MAG/ros-magob-20hz.xml
+++ b/NumericalData/CDPP-AMDA/Rosetta/MAG/ros-magob-20hz.xml
@@ -12,7 +12,7 @@
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/Ingo.Richter</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Ingo.Richter</PersonID>
                 <Role>DataProducer</Role>
             </Contact>
             <Association>
diff --git a/NumericalData/CDPP-AMDA/Rosetta/MAG/ros-magob-rsmp.xml b/NumericalData/CDPP-AMDA/Rosetta/MAG/ros-magob-rsmp.xml
index 11cca2d..c0449cb 100644
--- a/NumericalData/CDPP-AMDA/Rosetta/MAG/ros-magob-rsmp.xml
+++ b/NumericalData/CDPP-AMDA/Rosetta/MAG/ros-magob-rsmp.xml
@@ -12,7 +12,7 @@
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/Ingo.Richter</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Ingo.Richter</PersonID>
                 <Role>DataProducer</Role>
             </Contact>
             <Association>
diff --git a/NumericalData/CDPP-AMDA/Rosetta/MAG/ros-magob-rsmp1s.xml b/NumericalData/CDPP-AMDA/Rosetta/MAG/ros-magob-rsmp1s.xml
index fbd4e0f..61d83ef 100644
--- a/NumericalData/CDPP-AMDA/Rosetta/MAG/ros-magob-rsmp1s.xml
+++ b/NumericalData/CDPP-AMDA/Rosetta/MAG/ros-magob-rsmp1s.xml
@@ -12,7 +12,7 @@
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/Ingo.Richter</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Ingo.Richter</PersonID>
                 <Role>DataProducer</Role>
             </Contact>
             <Association>
diff --git a/NumericalData/CDPP-AMDA/Rosetta/MIP/ros-mip-estim.xml b/NumericalData/CDPP-AMDA/Rosetta/MIP/ros-mip-estim.xml
index 5dbb151..b36d2da 100644
--- a/NumericalData/CDPP-AMDA/Rosetta/MIP/ros-mip-estim.xml
+++ b/NumericalData/CDPP-AMDA/Rosetta/MIP/ros-mip-estim.xml
@@ -9,11 +9,11 @@
             <ReleaseDate>2016-10-15T14:08:29Z</ReleaseDate>
             <Description/>
             <Contact>       
-                <PersonID>spase://CNES/Person/Pierre.Henri</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Pierre.Henri</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <Contact>       
-                <PersonID>spase://CNES/Person/Vallieres</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Vallieres</PersonID>
                 <Role>DataProducer</Role>
             </Contact>
         </ResourceHeader>
diff --git a/NumericalData/CDPP-AMDA/Rosetta/MIP/ros-mip-ldl.xml b/NumericalData/CDPP-AMDA/Rosetta/MIP/ros-mip-ldl.xml
index d7e9d3d..7cd0926 100644
--- a/NumericalData/CDPP-AMDA/Rosetta/MIP/ros-mip-ldl.xml
+++ b/NumericalData/CDPP-AMDA/Rosetta/MIP/ros-mip-ldl.xml
@@ -9,11 +9,11 @@
             <ReleaseDate>2016-10-15T14:08:29Z</ReleaseDate>
             <Description>Active mode, with a signal transmitted in the plasma over 7 kHz - 168 kHz frequency bandwidth (also referred as LDL mode)</Description>
             <Contact>       
-                <PersonID>spase://CNES/Person/Pierre.Henri</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Pierre.Henri</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <Contact>       
-                <PersonID>spase://CNES/Person/Vallieres</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Vallieres</PersonID>
                 <Role>DataProducer</Role>
             </Contact>
             <Association>
diff --git a/NumericalData/CDPP-AMDA/Rosetta/MIP/ros-mip-ldlphase.xml b/NumericalData/CDPP-AMDA/Rosetta/MIP/ros-mip-ldlphase.xml
index fbe8ae0..d50fe1f 100644
--- a/NumericalData/CDPP-AMDA/Rosetta/MIP/ros-mip-ldlphase.xml
+++ b/NumericalData/CDPP-AMDA/Rosetta/MIP/ros-mip-ldlphase.xml
@@ -9,11 +9,11 @@
             <ReleaseDate>2016-10-15T14:08:29Z</ReleaseDate>
             <Description>Active mode, with a signal transmitted in the plasma over 7 kHz - 168 kHz frequency bandwidth (also referred as LDL mode)</Description>
             <Contact>       
-                <PersonID>spase://CNES/Person/Pierre.Henri</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Pierre.Henri</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <Contact>       
-                <PersonID>spase://CNES/Person/Vallieres</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Vallieres</PersonID>
                 <Role>DataProducer</Role>
             </Contact>
              <Association>
diff --git a/NumericalData/CDPP-AMDA/Rosetta/MIP/ros-mip-pass.xml b/NumericalData/CDPP-AMDA/Rosetta/MIP/ros-mip-pass.xml
index 9549b02..86eeed0 100644
--- a/NumericalData/CDPP-AMDA/Rosetta/MIP/ros-mip-pass.xml
+++ b/NumericalData/CDPP-AMDA/Rosetta/MIP/ros-mip-pass.xml
@@ -10,11 +10,11 @@
             <Description>In passive mode no signal is transmitted in the plasma, it consists of a power spectrum over all 
                 the 7 kHz - 448 kHz frequency bandwidth</Description>
             <Contact>       
-                <PersonID>spase://CNES/Person/Pierre.Henri</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Pierre.Henri</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <Contact>       
-                <PersonID>spase://CNES/Person/Vallieres</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Vallieres</PersonID>
                 <Role>DataProducer</Role>
             </Contact>            
         </ResourceHeader>
diff --git a/NumericalData/CDPP-AMDA/Rosetta/MIP/ros-mip-pasw.xml b/NumericalData/CDPP-AMDA/Rosetta/MIP/ros-mip-pasw.xml
index 7fc57a7..8151a4f 100644
--- a/NumericalData/CDPP-AMDA/Rosetta/MIP/ros-mip-pasw.xml
+++ b/NumericalData/CDPP-AMDA/Rosetta/MIP/ros-mip-pasw.xml
@@ -9,11 +9,11 @@
             <ReleaseDate>2016-10-15T14:08:29Z</ReleaseDate>
             <Description>In passive mode no signal is transmitted in the plasma, it consists of a power spectrum over all the 7 kHz - 448 kHz frequency bandwidth</Description>
             <Contact>       
-                <PersonID>spase://CNES/Person/Pierre.Henri</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Pierre.Henri</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <Contact>       
-                <PersonID>spase://CNES/Person/Vallieres</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Vallieres</PersonID>
                 <Role>DataProducer</Role>
             </Contact>
         </ResourceHeader>
diff --git a/NumericalData/CDPP-AMDA/Rosetta/MIP/ros-mip-surv.xml b/NumericalData/CDPP-AMDA/Rosetta/MIP/ros-mip-surv.xml
index fe8db64..b84eda2 100644
--- a/NumericalData/CDPP-AMDA/Rosetta/MIP/ros-mip-surv.xml
+++ b/NumericalData/CDPP-AMDA/Rosetta/MIP/ros-mip-surv.xml
@@ -9,11 +9,11 @@
             <ReleaseDate>2016-10-15T14:08:29Z</ReleaseDate>
             <Description>active mode, with a signal transmitted in the plasma over part of 14 kHz - 3.5 MHz frequency bandwidth, depending on operation (also referred as SDL mode)</Description>
             <Contact>       
-                <PersonID>spase://CNES/Person/Pierre.Henri</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Pierre.Henri</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <Contact>       
-                <PersonID>spase://CNES/Person/Vallieres</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Vallieres</PersonID>
                 <Role>DataProducer</Role>
             </Contact> 
             <Association>
diff --git a/NumericalData/CDPP-AMDA/Rosetta/MIP/ros-mip-survphase.xml b/NumericalData/CDPP-AMDA/Rosetta/MIP/ros-mip-survphase.xml
index 4b04124..7406e56 100644
--- a/NumericalData/CDPP-AMDA/Rosetta/MIP/ros-mip-survphase.xml
+++ b/NumericalData/CDPP-AMDA/Rosetta/MIP/ros-mip-survphase.xml
@@ -9,11 +9,11 @@
             <ReleaseDate>2016-10-15T14:08:29Z</ReleaseDate>
             <Description>Active mode, with a signal transmitted in the plasma over part of 14 kHz - 3.5 MHz frequency bandwidth, depending on operation (also referred as SDL mode)</Description>
             <Contact>       
-                <PersonID>spase://CNES/Person/Pierre.Henri</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Pierre.Henri</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <Contact>       
-                <PersonID>spase://CNES/Person/Vallieres</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Vallieres</PersonID>
                 <Role>DataProducer</Role>
             </Contact>
            <Association>
diff --git a/NumericalData/CDPP-AMDA/Rosetta/RSN/ros-rsn-bg.xml b/NumericalData/CDPP-AMDA/Rosetta/RSN/ros-rsn-bg.xml
index fe949c8..ba79de0 100644
--- a/NumericalData/CDPP-AMDA/Rosetta/RSN/ros-rsn-bg.xml
+++ b/NumericalData/CDPP-AMDA/Rosetta/RSN/ros-rsn-bg.xml
@@ -9,7 +9,7 @@
             <ReleaseDate>2019-03-09T21:56:11Z</ReleaseDate>
             <Description/>
             <Contact>       
-                <PersonID>spase://CNES/Person/Martin.Rubin</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Martin.Rubin</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <Association>
diff --git a/NumericalData/CDPP-AMDA/Rosetta/RSN/ros-rsn-cops.xml b/NumericalData/CDPP-AMDA/Rosetta/RSN/ros-rsn-cops.xml
index 7ab606e..c1e0ba0 100644
--- a/NumericalData/CDPP-AMDA/Rosetta/RSN/ros-rsn-cops.xml
+++ b/NumericalData/CDPP-AMDA/Rosetta/RSN/ros-rsn-cops.xml
@@ -9,7 +9,7 @@
             <ReleaseDate>2019-03-09T21:56:11Z</ReleaseDate>
             <Description/>
             <Contact>       
-                <PersonID>spase://CNES/Person/Martin.Rubin</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Martin.Rubin</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <Association>
diff --git a/NumericalData/CDPP-AMDA/Rosetta/RSN/ros-rsn-den.xml b/NumericalData/CDPP-AMDA/Rosetta/RSN/ros-rsn-den.xml
index 5d5b382..5268776 100644
--- a/NumericalData/CDPP-AMDA/Rosetta/RSN/ros-rsn-den.xml
+++ b/NumericalData/CDPP-AMDA/Rosetta/RSN/ros-rsn-den.xml
@@ -9,7 +9,7 @@
             <ReleaseDate>2016-10-15T14:08:29Z</ReleaseDate>
             <Description/>
             <Contact>       
-                <PersonID>spase://CNES/Person/Martin.Rubin</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Martin.Rubin</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
         </ResourceHeader>
diff --git a/NumericalData/CDPP-AMDA/Rosetta/RSN/ros-rsn-ng.xml b/NumericalData/CDPP-AMDA/Rosetta/RSN/ros-rsn-ng.xml
index a318b94..6145b5c 100644
--- a/NumericalData/CDPP-AMDA/Rosetta/RSN/ros-rsn-ng.xml
+++ b/NumericalData/CDPP-AMDA/Rosetta/RSN/ros-rsn-ng.xml
@@ -9,7 +9,7 @@
             <ReleaseDate>2019-03-09T08:32:48Z</ReleaseDate>
             <Description/>
             <Contact>       
-                <PersonID>spase://CNES/Person/Martin.Rubin</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Martin.Rubin</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <Association>
diff --git a/NumericalData/CDPP-AMDA/Rosetta/RSN/ros-rsn-rg.xml b/NumericalData/CDPP-AMDA/Rosetta/RSN/ros-rsn-rg.xml
index f1b8d07..69cd65e 100644
--- a/NumericalData/CDPP-AMDA/Rosetta/RSN/ros-rsn-rg.xml
+++ b/NumericalData/CDPP-AMDA/Rosetta/RSN/ros-rsn-rg.xml
@@ -9,7 +9,7 @@
             <ReleaseDate>2019-03-09T04:52:56Z</ReleaseDate>
             <Description/>
             <Contact>       
-                <PersonID>spase://CNES/Person/Martin.Rubin</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Martin.Rubin</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact> 
             <Association>
diff --git a/NumericalData/CDPP-AMDA/Rosetta/RSN/ros-rsn-sn.xml b/NumericalData/CDPP-AMDA/Rosetta/RSN/ros-rsn-sn.xml
index 43ef6e6..447c191 100644
--- a/NumericalData/CDPP-AMDA/Rosetta/RSN/ros-rsn-sn.xml
+++ b/NumericalData/CDPP-AMDA/Rosetta/RSN/ros-rsn-sn.xml
@@ -9,7 +9,7 @@
             <ReleaseDate>2019-03-09T04:52:56Z</ReleaseDate>
             <Description/>
             <Contact>       
-                <PersonID>spase://CNES/Person/Martin.Rubin</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Martin.Rubin</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <Association>
diff --git a/NumericalData/CDPP-AMDA/Rosetta/RSN/ros-rsn-sr.xml b/NumericalData/CDPP-AMDA/Rosetta/RSN/ros-rsn-sr.xml
index 112a1bc..8cd6f37 100644
--- a/NumericalData/CDPP-AMDA/Rosetta/RSN/ros-rsn-sr.xml
+++ b/NumericalData/CDPP-AMDA/Rosetta/RSN/ros-rsn-sr.xml
@@ -9,7 +9,7 @@
             <ReleaseDate>2019-03-09T04:52:56Z</ReleaseDate>
             <Description/>
             <Contact>       
-                <PersonID>spase://CNES/Person/Martin.Rubin</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Martin.Rubin</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <Association>
diff --git a/NumericalData/CDPP-AMDA/STEREO-A/Ephemeris/sta-l2-orb.xml b/NumericalData/CDPP-AMDA/STEREO-A/Ephemeris/sta-l2-orb.xml
index 1161765..2e96301 100644
--- a/NumericalData/CDPP-AMDA/STEREO-A/Ephemeris/sta-l2-orb.xml
+++ b/NumericalData/CDPP-AMDA/STEREO-A/Ephemeris/sta-l2-orb.xml
@@ -9,7 +9,7 @@
             <ReleaseDate>2015-10-14T11:46:29Z</ReleaseDate>
             <Description>STEREO-A orbit is calculated using SPICE kernels from https://sohowww.nascom.nasa.gov at IRAP</Description>
             <Contact>
-                <PersonID>spase://CNES/Person/Elena.Budnik</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Elena.Budnik</PersonID>
                 <Role>TechnicalContact</Role>
             </Contact>
         </ResourceHeader>
diff --git a/NumericalData/CDPP-AMDA/STEREO-A/HET/sta-het-1d.xml b/NumericalData/CDPP-AMDA/STEREO-A/HET/sta-het-1d.xml
index 93c149a..eb155e2 100644
--- a/NumericalData/CDPP-AMDA/STEREO-A/HET/sta-het-1d.xml
+++ b/NumericalData/CDPP-AMDA/STEREO-A/HET/sta-het-1d.xml
@@ -9,7 +9,7 @@
             <ReleaseDate>2015-10-14T11:48:00Z</ReleaseDate>
             <Description/>
              <Contact>
-                <PersonID>spase://CNES/Person/Janet.G.Luhmann</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Janet.G.Luhmann</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
         </ResourceHeader>
diff --git a/NumericalData/CDPP-AMDA/STEREO-A/HET/sta-het-1h.xml b/NumericalData/CDPP-AMDA/STEREO-A/HET/sta-het-1h.xml
index 9ffcf6e..e1b6eb8 100644
--- a/NumericalData/CDPP-AMDA/STEREO-A/HET/sta-het-1h.xml
+++ b/NumericalData/CDPP-AMDA/STEREO-A/HET/sta-het-1h.xml
@@ -9,7 +9,7 @@
             <ReleaseDate>2015-10-14T11:48:00Z</ReleaseDate>
             <Description/>
              <Contact>
-                <PersonID>spase://CNES/Person/Janet.G.Luhmann</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Janet.G.Luhmann</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
         </ResourceHeader>
diff --git a/NumericalData/CDPP-AMDA/STEREO-A/HET/sta-het-1min.xml b/NumericalData/CDPP-AMDA/STEREO-A/HET/sta-het-1min.xml
index fceadb2..6512b73 100644
--- a/NumericalData/CDPP-AMDA/STEREO-A/HET/sta-het-1min.xml
+++ b/NumericalData/CDPP-AMDA/STEREO-A/HET/sta-het-1min.xml
@@ -9,7 +9,7 @@
             <ReleaseDate>2015-10-14T11:48:00Z</ReleaseDate>
             <Description/>
              <Contact>
-                <PersonID>spase://CNES/Person/Janet.G.Luhmann</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Janet.G.Luhmann</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
         </ResourceHeader>
diff --git a/NumericalData/CDPP-AMDA/STEREO-A/LET/sta-let-10min.xml b/NumericalData/CDPP-AMDA/STEREO-A/LET/sta-let-10min.xml
index 8435944..cb29123 100644
--- a/NumericalData/CDPP-AMDA/STEREO-A/LET/sta-let-10min.xml
+++ b/NumericalData/CDPP-AMDA/STEREO-A/LET/sta-let-10min.xml
@@ -19,7 +19,7 @@
                 * M is the number of good 1-minute records in the averaging interval.
             </Description>
              <Contact>
-                <PersonID>spase://CNES/Person/Janet.G.Luhmann</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Janet.G.Luhmann</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/STEREO-A/LET/sta-let-1day.xml b/NumericalData/CDPP-AMDA/STEREO-A/LET/sta-let-1day.xml
index f584261..97ef428 100644
--- a/NumericalData/CDPP-AMDA/STEREO-A/LET/sta-let-1day.xml
+++ b/NumericalData/CDPP-AMDA/STEREO-A/LET/sta-let-1day.xml
@@ -19,7 +19,7 @@
                 * M is the number of good 1-minute records in the averaging interval.
             </Description>
              <Contact>
-                <PersonID>spase://CNES/Person/Janet.G.Luhmann</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Janet.G.Luhmann</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/STEREO-A/LET/sta-let-1hour.xml b/NumericalData/CDPP-AMDA/STEREO-A/LET/sta-let-1hour.xml
index 02eb83c..9f9db09 100644
--- a/NumericalData/CDPP-AMDA/STEREO-A/LET/sta-let-1hour.xml
+++ b/NumericalData/CDPP-AMDA/STEREO-A/LET/sta-let-1hour.xml
@@ -19,7 +19,7 @@
                 * M is the number of good 1-minute records in the averaging interval.
             </Description>
              <Contact>
-                <PersonID>spase://CNES/Person/Janet.G.Luhmann</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Janet.G.Luhmann</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/STEREO-A/MAG/sta-b-1min.xml b/NumericalData/CDPP-AMDA/STEREO-A/MAG/sta-b-1min.xml
index 88fc981..43fee52 100644
--- a/NumericalData/CDPP-AMDA/STEREO-A/MAG/sta-b-1min.xml
+++ b/NumericalData/CDPP-AMDA/STEREO-A/MAG/sta-b-1min.xml
@@ -8,7 +8,7 @@
             <ReleaseDate>2018-10-14T11:53:29Z</ReleaseDate>
             <Description>Data from http://aten.igpp.ucla.edu. The averaged total field is also averaged from the high resolution total field and not from the averaged components.</Description>
             <Contact>
-                <PersonID>spase://CNES/Person/Elena.Budnik</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Elena.Budnik</PersonID>
                 <Role>TechnicalContact</Role>
             </Contact>
         </ResourceHeader>
diff --git a/NumericalData/CDPP-AMDA/STEREO-A/MAG/sta-mag-mag.xml b/NumericalData/CDPP-AMDA/STEREO-A/MAG/sta-mag-mag.xml
index 511b6b2..261ceb2 100644
--- a/NumericalData/CDPP-AMDA/STEREO-A/MAG/sta-mag-mag.xml
+++ b/NumericalData/CDPP-AMDA/STEREO-A/MAG/sta-mag-mag.xml
@@ -8,7 +8,7 @@
             <ReleaseDate>2018-10-14T11:53:29Z</ReleaseDate>
             <Description>Data from http://aten.igpp.ucla.edu. The 1s data are created from the 125ms data by overlapped averages. The averaged total field is also averaged from the high resolution total field and not from the averaged components.</Description>
             <Contact>
-                <PersonID>spase://CNES/Person/Elena.Budnik</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Elena.Budnik</PersonID>
                 <Role>TechnicalContact</Role>
             </Contact>
         </ResourceHeader>
diff --git a/NumericalData/CDPP-AMDA/STEREO-A/PLASTIC/sta-l2-pla.xml b/NumericalData/CDPP-AMDA/STEREO-A/PLASTIC/sta-l2-pla.xml
index c4cc576..afba12c 100644
--- a/NumericalData/CDPP-AMDA/STEREO-A/PLASTIC/sta-l2-pla.xml
+++ b/NumericalData/CDPP-AMDA/STEREO-A/PLASTIC/sta-l2-pla.xml
@@ -26,7 +26,7 @@ and are derived using the N/S and E/W angles.
         <Role>PrincipalInvestigator</Role>
       </Contact>   
             <Contact>
-        <PersonID>spase://CNES/Person/lorna.ellis</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/lorna.ellis</PersonID>
         <Role>DataProducer</Role>
       </Contact>
         </ResourceHeader>
diff --git a/NumericalData/CDPP-AMDA/STEREO-A/SEPT/sta-sept-1day.xml b/NumericalData/CDPP-AMDA/STEREO-A/SEPT/sta-sept-1day.xml
index 62a02bd..2610710 100644
--- a/NumericalData/CDPP-AMDA/STEREO-A/SEPT/sta-sept-1day.xml
+++ b/NumericalData/CDPP-AMDA/STEREO-A/SEPT/sta-sept-1day.xml
@@ -14,7 +14,7 @@
                 * Intensities and uncertainties are given in 1/(cm^2 s sr MeV)
             </Description>
              <Contact>
-                <PersonID>spase://CNES/Person/Janet.G.Luhmann</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Janet.G.Luhmann</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/STEREO-A/SEPT/sta-sept-1hour.xml b/NumericalData/CDPP-AMDA/STEREO-A/SEPT/sta-sept-1hour.xml
index d900b05..f3c0be1 100644
--- a/NumericalData/CDPP-AMDA/STEREO-A/SEPT/sta-sept-1hour.xml
+++ b/NumericalData/CDPP-AMDA/STEREO-A/SEPT/sta-sept-1hour.xml
@@ -15,7 +15,7 @@
                
             </Description>
              <Contact>
-                <PersonID>spase://CNES/Person/Janet.G.Luhmann</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Janet.G.Luhmann</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/STEREO-A/SEPT/sta-sept-1min.xml b/NumericalData/CDPP-AMDA/STEREO-A/SEPT/sta-sept-1min.xml
index 399d1ce..5bcc93a 100644
--- a/NumericalData/CDPP-AMDA/STEREO-A/SEPT/sta-sept-1min.xml
+++ b/NumericalData/CDPP-AMDA/STEREO-A/SEPT/sta-sept-1min.xml
@@ -14,7 +14,7 @@
                 * Intensities and uncertainties are given in 1/(cm^2 s sr MeV)
             </Description>
              <Contact>
-                <PersonID>spase://CNES/Person/Janet.G.Luhmann</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Janet.G.Luhmann</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/STEREO-A/SIT/sta-sit-1d.xml b/NumericalData/CDPP-AMDA/STEREO-A/SIT/sta-sit-1d.xml
index 1d1e968..753eef9 100644
--- a/NumericalData/CDPP-AMDA/STEREO-A/SIT/sta-sit-1d.xml
+++ b/NumericalData/CDPP-AMDA/STEREO-A/SIT/sta-sit-1d.xml
@@ -9,7 +9,7 @@
             <ReleaseDate>2015-10-14T11:48:00Z</ReleaseDate>
             <Description/>
              <Contact>
-                <PersonID>spase://CNES/Person/Janet.G.Luhmann</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Janet.G.Luhmann</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/STEREO-A/SIT/sta-sit-1h.xml b/NumericalData/CDPP-AMDA/STEREO-A/SIT/sta-sit-1h.xml
index 234ae7c..9cedc8e 100644
--- a/NumericalData/CDPP-AMDA/STEREO-A/SIT/sta-sit-1h.xml
+++ b/NumericalData/CDPP-AMDA/STEREO-A/SIT/sta-sit-1h.xml
@@ -9,7 +9,7 @@
             <ReleaseDate>2015-10-14T11:48:00Z</ReleaseDate>
             <Description/>
              <Contact>
-                <PersonID>spase://CNES/Person/Janet.G.Luhmann</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Janet.G.Luhmann</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/STEREO-A/SIT/sta-sit-1min.xml b/NumericalData/CDPP-AMDA/STEREO-A/SIT/sta-sit-1min.xml
index c12c0f5..6d3fe02 100644
--- a/NumericalData/CDPP-AMDA/STEREO-A/SIT/sta-sit-1min.xml
+++ b/NumericalData/CDPP-AMDA/STEREO-A/SIT/sta-sit-1min.xml
@@ -9,7 +9,7 @@
             <ReleaseDate>2015-10-14T11:48:00Z</ReleaseDate>
             <Description/>
              <Contact>
-                <PersonID>spase://CNES/Person/Janet.G.Luhmann</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Janet.G.Luhmann</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/STEREO-A/SWEA/sta-swea-mom.xml b/NumericalData/CDPP-AMDA/STEREO-A/SWEA/sta-swea-mom.xml
index fb2d8e0..e826cfe 100644
--- a/NumericalData/CDPP-AMDA/STEREO-A/SWEA/sta-swea-mom.xml
+++ b/NumericalData/CDPP-AMDA/STEREO-A/SWEA/sta-swea-mom.xml
@@ -8,11 +8,11 @@
             <ReleaseDate>2015-10-14T11:48:00Z</ReleaseDate>
             <Description/>
              <Contact>
-                <PersonID>spase://CNES/Person/Sauvaud</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Sauvaud</PersonID>
                 <Role>CoInvestigator</Role>
             </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/Penou</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Penou</PersonID>
                 <Role>DataProducer</Role>
             </Contact>
         </ResourceHeader>
diff --git a/NumericalData/CDPP-AMDA/STEREO-A/SWEA/sta-swea-pad.xml b/NumericalData/CDPP-AMDA/STEREO-A/SWEA/sta-swea-pad.xml
index f13e6b5..3581b55 100644
--- a/NumericalData/CDPP-AMDA/STEREO-A/SWEA/sta-swea-pad.xml
+++ b/NumericalData/CDPP-AMDA/STEREO-A/SWEA/sta-swea-pad.xml
@@ -9,11 +9,11 @@
             <ReleaseDate>2015-10-14T10:05:00Z</ReleaseDate>
             <Description/>
             <Contact>
-                <PersonID>spase://CNES/Person/Sauvaud</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Sauvaud</PersonID>
                 <Role>CoInvestigator</Role>
             </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/Penou</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Penou</PersonID>
                 <Role>DataProducer</Role>
             </Contact>
         </ResourceHeader>
diff --git a/NumericalData/CDPP-AMDA/STEREO-B/Ephemeris/stb-l2-orb.xml b/NumericalData/CDPP-AMDA/STEREO-B/Ephemeris/stb-l2-orb.xml
index 8b021ba..d7f172d 100644
--- a/NumericalData/CDPP-AMDA/STEREO-B/Ephemeris/stb-l2-orb.xml
+++ b/NumericalData/CDPP-AMDA/STEREO-B/Ephemeris/stb-l2-orb.xml
@@ -8,7 +8,7 @@
             <ReleaseDate>2018-10-14T14:37:00Z</ReleaseDate>
             <Description>STEREO-B orbit is calculated using SPICE kernels from https://sohowww.nascom.nasa.gov at IRAP</Description>
             <Contact>
-                <PersonID>spase://CNES/Person/Elena.Budnik</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Elena.Budnik</PersonID>
                 <Role>TechnicalContact</Role>
             </Contact>
         </ResourceHeader>
diff --git a/NumericalData/CDPP-AMDA/STEREO-B/HET/stb-het-1d.xml b/NumericalData/CDPP-AMDA/STEREO-B/HET/stb-het-1d.xml
index 75426ef..685ee17 100644
--- a/NumericalData/CDPP-AMDA/STEREO-B/HET/stb-het-1d.xml
+++ b/NumericalData/CDPP-AMDA/STEREO-B/HET/stb-het-1d.xml
@@ -9,7 +9,7 @@
             <ReleaseDate>2015-10-14T11:48:00Z</ReleaseDate>
             <Description/>
              <Contact>
-                <PersonID>spase://CNES/Person/Janet.G.Luhmann</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Janet.G.Luhmann</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
         </ResourceHeader>
diff --git a/NumericalData/CDPP-AMDA/STEREO-B/HET/stb-het-1h.xml b/NumericalData/CDPP-AMDA/STEREO-B/HET/stb-het-1h.xml
index ae7276f..0397327 100644
--- a/NumericalData/CDPP-AMDA/STEREO-B/HET/stb-het-1h.xml
+++ b/NumericalData/CDPP-AMDA/STEREO-B/HET/stb-het-1h.xml
@@ -9,7 +9,7 @@
             <ReleaseDate>2015-10-14T11:48:00Z</ReleaseDate>
             <Description/>
              <Contact>
-                <PersonID>spase://CNES/Person/Janet.G.Luhmann</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Janet.G.Luhmann</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
         </ResourceHeader>
diff --git a/NumericalData/CDPP-AMDA/STEREO-B/HET/stb-het-1min.xml b/NumericalData/CDPP-AMDA/STEREO-B/HET/stb-het-1min.xml
index 851886e..e9611ba 100644
--- a/NumericalData/CDPP-AMDA/STEREO-B/HET/stb-het-1min.xml
+++ b/NumericalData/CDPP-AMDA/STEREO-B/HET/stb-het-1min.xml
@@ -9,7 +9,7 @@
             <ReleaseDate>2015-10-14T11:48:00Z</ReleaseDate>
             <Description/>
              <Contact>
-                <PersonID>spase://CNES/Person/Janet.G.Luhmann</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Janet.G.Luhmann</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
         </ResourceHeader>
diff --git a/NumericalData/CDPP-AMDA/STEREO-B/LET/stb-let-10min.xml b/NumericalData/CDPP-AMDA/STEREO-B/LET/stb-let-10min.xml
index 0d047de..b77c9eb 100644
--- a/NumericalData/CDPP-AMDA/STEREO-B/LET/stb-let-10min.xml
+++ b/NumericalData/CDPP-AMDA/STEREO-B/LET/stb-let-10min.xml
@@ -19,7 +19,7 @@
                 * M is the number of good 1-minute records in the averaging interval.
             </Description>
              <Contact>
-                <PersonID>spase://CNES/Person/Janet.G.Luhmann</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Janet.G.Luhmann</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/STEREO-B/LET/stb-let-1day.xml b/NumericalData/CDPP-AMDA/STEREO-B/LET/stb-let-1day.xml
index fc14413..579eba8 100644
--- a/NumericalData/CDPP-AMDA/STEREO-B/LET/stb-let-1day.xml
+++ b/NumericalData/CDPP-AMDA/STEREO-B/LET/stb-let-1day.xml
@@ -19,7 +19,7 @@
                 * M is the number of good 1-minute records in the averaging interval.
             </Description>
              <Contact>
-                <PersonID>spase://CNES/Person/Janet.G.Luhmann</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Janet.G.Luhmann</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/STEREO-B/LET/stb-let-1hour.xml b/NumericalData/CDPP-AMDA/STEREO-B/LET/stb-let-1hour.xml
index e71fafb..80e3b7f 100644
--- a/NumericalData/CDPP-AMDA/STEREO-B/LET/stb-let-1hour.xml
+++ b/NumericalData/CDPP-AMDA/STEREO-B/LET/stb-let-1hour.xml
@@ -19,7 +19,7 @@
                * M is the number of good 1-minute records in the averaging interval.
             </Description>
              <Contact>
-                <PersonID>spase://CNES/Person/Janet.G.Luhmann</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Janet.G.Luhmann</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/STEREO-B/MAG/stb-b-1min.xml b/NumericalData/CDPP-AMDA/STEREO-B/MAG/stb-b-1min.xml
index abb90c6..cea452d 100644
--- a/NumericalData/CDPP-AMDA/STEREO-B/MAG/stb-b-1min.xml
+++ b/NumericalData/CDPP-AMDA/STEREO-B/MAG/stb-b-1min.xml
@@ -8,7 +8,7 @@
             <ReleaseDate>2018-10-14T11:53:29Z</ReleaseDate>
             <Description>Data from http://aten.igpp.ucla.edu. The averaged total field is also averaged from the high resolution total field and not from the averaged components.</Description>
             <Contact>
-                <PersonID>spase://CNES/Person/Elena.Budnik</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Elena.Budnik</PersonID>
                 <Role>TechnicalContact</Role>
             </Contact>
         </ResourceHeader>
diff --git a/NumericalData/CDPP-AMDA/STEREO-B/MAG/stb-mag-mag.xml b/NumericalData/CDPP-AMDA/STEREO-B/MAG/stb-mag-mag.xml
index 0f6e3c5..ab8af87 100644
--- a/NumericalData/CDPP-AMDA/STEREO-B/MAG/stb-mag-mag.xml
+++ b/NumericalData/CDPP-AMDA/STEREO-B/MAG/stb-mag-mag.xml
@@ -9,7 +9,7 @@
             <ReleaseDate>2018-10-14T14:39:00Z</ReleaseDate>
             <Description>Data from http://aten.igpp.ucla.edu. The 1s data are created from the 125ms data by overlapped averages. The averaged total field is also averaged from the high resolution total field and not from the averaged components.</Description>
             <Contact>
-                <PersonID>spase://CNES/Person/Elena.Budnik</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Elena.Budnik</PersonID>
                 <Role>TechnicalContact</Role>
             </Contact>
         </ResourceHeader>
diff --git a/NumericalData/CDPP-AMDA/STEREO-B/PLASTIC/stb-l2-pla.xml b/NumericalData/CDPP-AMDA/STEREO-B/PLASTIC/stb-l2-pla.xml
index 7e81af5..b250b55 100644
--- a/NumericalData/CDPP-AMDA/STEREO-B/PLASTIC/stb-l2-pla.xml
+++ b/NumericalData/CDPP-AMDA/STEREO-B/PLASTIC/stb-l2-pla.xml
@@ -26,7 +26,7 @@ and are derived using the N/S and E/W angles.
         <Role>PrincipalInvestigator</Role>
       </Contact>   
             <Contact>
-        <PersonID>spase://CNES/Person/lorna.ellis</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/lorna.ellis</PersonID>
         <Role>DataProducer</Role>
       </Contact>            
         </ResourceHeader>
diff --git a/NumericalData/CDPP-AMDA/STEREO-B/SEPT/stb-sept-1day.xml b/NumericalData/CDPP-AMDA/STEREO-B/SEPT/stb-sept-1day.xml
index 26eb1a9..6f641e1 100644
--- a/NumericalData/CDPP-AMDA/STEREO-B/SEPT/stb-sept-1day.xml
+++ b/NumericalData/CDPP-AMDA/STEREO-B/SEPT/stb-sept-1day.xml
@@ -14,7 +14,7 @@
                 * Intensities and uncertainties are given in 1/(cm^2 s sr MeV)
             </Description>
              <Contact>
-                <PersonID>spase://CNES/Person/Janet.G.Luhmann</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Janet.G.Luhmann</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/STEREO-B/SEPT/stb-sept-1hour.xml b/NumericalData/CDPP-AMDA/STEREO-B/SEPT/stb-sept-1hour.xml
index d6eb792..8b42826 100644
--- a/NumericalData/CDPP-AMDA/STEREO-B/SEPT/stb-sept-1hour.xml
+++ b/NumericalData/CDPP-AMDA/STEREO-B/SEPT/stb-sept-1hour.xml
@@ -14,7 +14,7 @@
                 * Intensities and uncertainties are given in 1/(cm^2 s sr MeV)
             </Description>
              <Contact>
-                <PersonID>spase://CNES/Person/Janet.G.Luhmann</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Janet.G.Luhmann</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/STEREO-B/SEPT/stb-sept-1min.xml b/NumericalData/CDPP-AMDA/STEREO-B/SEPT/stb-sept-1min.xml
index f02f1af..b8e9701 100644
--- a/NumericalData/CDPP-AMDA/STEREO-B/SEPT/stb-sept-1min.xml
+++ b/NumericalData/CDPP-AMDA/STEREO-B/SEPT/stb-sept-1min.xml
@@ -14,7 +14,7 @@
                 * Intensities and uncertainties are given in 1/(cm^2 s sr MeV)
             </Description>
              <Contact>
-                <PersonID>spase://CNES/Person/Janet.G.Luhmann</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Janet.G.Luhmann</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/STEREO-B/SIT/stb-sit-1d.xml b/NumericalData/CDPP-AMDA/STEREO-B/SIT/stb-sit-1d.xml
index 0ad35ce..2c52f17 100644
--- a/NumericalData/CDPP-AMDA/STEREO-B/SIT/stb-sit-1d.xml
+++ b/NumericalData/CDPP-AMDA/STEREO-B/SIT/stb-sit-1d.xml
@@ -9,7 +9,7 @@
             <ReleaseDate>2015-10-14T11:48:00Z</ReleaseDate>
             <Description/>
              <Contact>
-                <PersonID>spase://CNES/Person/Janet.G.Luhmann</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Janet.G.Luhmann</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/STEREO-B/SIT/stb-sit-1h.xml b/NumericalData/CDPP-AMDA/STEREO-B/SIT/stb-sit-1h.xml
index 0373d14..9879dc4 100644
--- a/NumericalData/CDPP-AMDA/STEREO-B/SIT/stb-sit-1h.xml
+++ b/NumericalData/CDPP-AMDA/STEREO-B/SIT/stb-sit-1h.xml
@@ -9,7 +9,7 @@
             <ReleaseDate>2015-10-14T11:48:00Z</ReleaseDate>
             <Description/>
              <Contact>
-                <PersonID>spase://CNES/Person/Janet.G.Luhmann</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Janet.G.Luhmann</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/STEREO-B/SIT/stb-sit-1min.xml b/NumericalData/CDPP-AMDA/STEREO-B/SIT/stb-sit-1min.xml
index 4824e81..092f7a7 100644
--- a/NumericalData/CDPP-AMDA/STEREO-B/SIT/stb-sit-1min.xml
+++ b/NumericalData/CDPP-AMDA/STEREO-B/SIT/stb-sit-1min.xml
@@ -9,7 +9,7 @@
             <ReleaseDate>2015-10-14T11:48:00Z</ReleaseDate>
             <Description/>
              <Contact>
-                <PersonID>spase://CNES/Person/Janet.G.Luhmann</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Janet.G.Luhmann</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/STEREO-B/SWEA/stb-swea-mom.xml b/NumericalData/CDPP-AMDA/STEREO-B/SWEA/stb-swea-mom.xml
index 1724dd9..8c4b508 100644
--- a/NumericalData/CDPP-AMDA/STEREO-B/SWEA/stb-swea-mom.xml
+++ b/NumericalData/CDPP-AMDA/STEREO-B/SWEA/stb-swea-mom.xml
@@ -8,11 +8,11 @@
             <ReleaseDate>2015-10-14T14:42:00Z</ReleaseDate>
             <Description/>
               <Contact>
-                <PersonID>spase://CNES/Person/Sauvaud</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Sauvaud</PersonID>
                 <Role>CoInvestigator</Role>
             </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/Penou</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Penou</PersonID>
                 <Role>DataProducer</Role>
             </Contact>           
         </ResourceHeader>
diff --git a/NumericalData/CDPP-AMDA/STEREO-B/SWEA/stb-swea-pad.xml b/NumericalData/CDPP-AMDA/STEREO-B/SWEA/stb-swea-pad.xml
index 29414be..3189342 100644
--- a/NumericalData/CDPP-AMDA/STEREO-B/SWEA/stb-swea-pad.xml
+++ b/NumericalData/CDPP-AMDA/STEREO-B/SWEA/stb-swea-pad.xml
@@ -9,11 +9,11 @@
             <ReleaseDate>2014-12-12T10:24:00Z</ReleaseDate>
             <Description/>
               <Contact>
-                <PersonID>spase://CNES/Person/Sauvaud</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Sauvaud</PersonID>
                 <Role>CoInvestigator</Role>
             </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/Penou</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Penou</PersonID>
                 <Role>DataProducer</Role>
             </Contact>
         </ResourceHeader>
diff --git a/NumericalData/CDPP-AMDA/SWARM-A/Ephemeris/swarma-orb-all.xml b/NumericalData/CDPP-AMDA/SWARM-A/Ephemeris/swarma-orb-all.xml
index 77b46b8..eab47f7 100644
--- a/NumericalData/CDPP-AMDA/SWARM-A/Ephemeris/swarma-orb-all.xml
+++ b/NumericalData/CDPP-AMDA/SWARM-A/Ephemeris/swarma-orb-all.xml
@@ -10,7 +10,7 @@
             <Description> </Description>
             <Acknowledgement> </Acknowledgement>
             <Contact>
-                <PersonID>spase://CNES/Person/R.Haagmans</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/R.Haagmans</PersonID>
                 <Role>ProjectScientist</Role>
             </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/SWARM-A/Ephemeris/swarma-orb-lp.xml b/NumericalData/CDPP-AMDA/SWARM-A/Ephemeris/swarma-orb-lp.xml
index 8de34f8..9468d14 100644
--- a/NumericalData/CDPP-AMDA/SWARM-A/Ephemeris/swarma-orb-lp.xml
+++ b/NumericalData/CDPP-AMDA/SWARM-A/Ephemeris/swarma-orb-lp.xml
@@ -10,7 +10,7 @@
             <Description/> 
             <Acknowledgement/> 
             <Contact>
-                <PersonID>spase://CNES/Person/S.Buchert</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/S.Buchert</PersonID>
                 <Role>Scientist</Role>
             </Contact> 
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/SWARM-A/Ephemeris/swarma-orb-tii.xml b/NumericalData/CDPP-AMDA/SWARM-A/Ephemeris/swarma-orb-tii.xml
index 739f4b2..15c6ea4 100644
--- a/NumericalData/CDPP-AMDA/SWARM-A/Ephemeris/swarma-orb-tii.xml
+++ b/NumericalData/CDPP-AMDA/SWARM-A/Ephemeris/swarma-orb-tii.xml
@@ -10,7 +10,7 @@
             <Description/> 
             <Acknowledgement/> 
              <Contact>
-                <PersonID>spase://CNES/Person/Johnathan.Burchill</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Johnathan.Burchill</PersonID>
                 <Role>Scientist</Role>
             </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/SWARM-A/GNSS/swarma-gps-all.xml b/NumericalData/CDPP-AMDA/SWARM-A/GNSS/swarma-gps-all.xml
index 8e94e8b..e2bc27d 100644
--- a/NumericalData/CDPP-AMDA/SWARM-A/GNSS/swarma-gps-all.xml
+++ b/NumericalData/CDPP-AMDA/SWARM-A/GNSS/swarma-gps-all.xml
@@ -13,7 +13,7 @@ GNSS signal delay we can estimate slant total electron content (STEC), which is 
 ‘integrated’ electron density along the line of sight from Swarm to GNSS satellites.</Description>
             <Acknowledgement/> 
             <Contact>
-                <PersonID>spase://CNES/Person/R.Haagmans</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/R.Haagmans</PersonID>
                 <Role>ProjectScientist</Role>
             </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/SWARM-A/LP/swarma-lp-all.xml b/NumericalData/CDPP-AMDA/SWARM-A/LP/swarma-lp-all.xml
index 98f84c0..20d00b4 100644
--- a/NumericalData/CDPP-AMDA/SWARM-A/LP/swarma-lp-all.xml
+++ b/NumericalData/CDPP-AMDA/SWARM-A/LP/swarma-lp-all.xml
@@ -19,7 +19,7 @@ The data are intended for users with some experience and understanding of Langmu
  </Description>
             <Acknowledgement> </Acknowledgement>
            <Contact>
-               <PersonID>spase://CNES/Person/S.Buchert</PersonID>
+               <PersonID>spase://CNES/Person/CDPP-AMDA/S.Buchert</PersonID>
                <Role>Scientist</Role>
            </Contact> 
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/SWARM-A/MAG/swarma-fac-all.xml b/NumericalData/CDPP-AMDA/SWARM-A/MAG/swarma-fac-all.xml
index 5d29b26..2777c5a 100644
--- a/NumericalData/CDPP-AMDA/SWARM-A/MAG/swarma-fac-all.xml
+++ b/NumericalData/CDPP-AMDA/SWARM-A/MAG/swarma-fac-all.xml
@@ -10,7 +10,7 @@
             <Description/> 
             <Acknowledgement/> 
              <Contact>
-               <PersonID>spase://CNES/Person/P.Ritter</PersonID>
+               <PersonID>spase://CNES/Person/CDPP-AMDA/P.Ritter</PersonID>
                <Role>Scientist</Role>
              </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/SWARM-A/MAG/swarma-mag-all.xml b/NumericalData/CDPP-AMDA/SWARM-A/MAG/swarma-mag-all.xml
index 82be1dc..c650c75 100644
--- a/NumericalData/CDPP-AMDA/SWARM-A/MAG/swarma-mag-all.xml
+++ b/NumericalData/CDPP-AMDA/SWARM-A/MAG/swarma-mag-all.xml
@@ -10,7 +10,7 @@
             <Description/> 
             <Acknowledgement/> 
            <Contact>
-               <PersonID>spase://CNES/Person/G.Hulot</PersonID>
+               <PersonID>spase://CNES/Person/CDPP-AMDA/G.Hulot</PersonID>
                <Role>PrincipalInvestigator</Role>
            </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/SWARM-A/MAG/swarma-mag-tii.xml b/NumericalData/CDPP-AMDA/SWARM-A/MAG/swarma-mag-tii.xml
index 5751c38..108024e 100644
--- a/NumericalData/CDPP-AMDA/SWARM-A/MAG/swarma-mag-tii.xml
+++ b/NumericalData/CDPP-AMDA/SWARM-A/MAG/swarma-mag-tii.xml
@@ -10,7 +10,7 @@
             <Description></Description>
             <Acknowledgement></Acknowledgement>
             <Contact>
-                <PersonID>spase://CNES/Person/Johnathan.Burchill</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Johnathan.Burchill</PersonID>
                 <Role>Scientist</Role>
             </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/SWARM-A/MAG/swarmac-fac-all.xml b/NumericalData/CDPP-AMDA/SWARM-A/MAG/swarmac-fac-all.xml
index ebbdcaf..426e546 100644
--- a/NumericalData/CDPP-AMDA/SWARM-A/MAG/swarmac-fac-all.xml
+++ b/NumericalData/CDPP-AMDA/SWARM-A/MAG/swarmac-fac-all.xml
@@ -10,7 +10,7 @@
             <Description/> 
             <Acknowledgement/> 
               <Contact>
-               <PersonID>spase://CNES/Person/P.Ritter</PersonID>
+               <PersonID>spase://CNES/Person/CDPP-AMDA/P.Ritter</PersonID>
                <Role>Scientist</Role>
              </Contact> 
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/SWARM-A/TII/swarma-tii-all.xml b/NumericalData/CDPP-AMDA/SWARM-A/TII/swarma-tii-all.xml
index 735e75b..e221fe9 100644
--- a/NumericalData/CDPP-AMDA/SWARM-A/TII/swarma-tii-all.xml
+++ b/NumericalData/CDPP-AMDA/SWARM-A/TII/swarma-tii-all.xml
@@ -10,7 +10,7 @@
             <Description></Description>
             <Acknowledgement></Acknowledgement>
             <Contact>
-                <PersonID>spase://CNES/Person/Johnathan.Burchill</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Johnathan.Burchill</PersonID>
                 <Role>Scientist</Role>
             </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/SWARM-A/TII/swarma-tii-prov.xml b/NumericalData/CDPP-AMDA/SWARM-A/TII/swarma-tii-prov.xml
index 7d04cfb..401b46c 100644
--- a/NumericalData/CDPP-AMDA/SWARM-A/TII/swarma-tii-prov.xml
+++ b/NumericalData/CDPP-AMDA/SWARM-A/TII/swarma-tii-prov.xml
@@ -10,7 +10,7 @@
             <Description></Description>
             <Acknowledgement></Acknowledgement>
             <Contact>
-                <PersonID>spase://CNES/Person/Johnathan.Burchill</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Johnathan.Burchill</PersonID>
                 <Role>Scientist</Role>
             </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/SWARM-B/Ephemeris/swarmb-orb-all.xml b/NumericalData/CDPP-AMDA/SWARM-B/Ephemeris/swarmb-orb-all.xml
index 88646a8..63f6f73 100644
--- a/NumericalData/CDPP-AMDA/SWARM-B/Ephemeris/swarmb-orb-all.xml
+++ b/NumericalData/CDPP-AMDA/SWARM-B/Ephemeris/swarmb-orb-all.xml
@@ -10,7 +10,7 @@
             <Description/> 
             <Acknowledgement/> 
             <Contact>
-                <PersonID>spase://CNES/Person/R.Haagmans</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/R.Haagmans</PersonID>
                 <Role>ProjectScientist</Role>
             </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/SWARM-B/Ephemeris/swarmb-orb-lp.xml b/NumericalData/CDPP-AMDA/SWARM-B/Ephemeris/swarmb-orb-lp.xml
index fe7d826..80b49ab 100644
--- a/NumericalData/CDPP-AMDA/SWARM-B/Ephemeris/swarmb-orb-lp.xml
+++ b/NumericalData/CDPP-AMDA/SWARM-B/Ephemeris/swarmb-orb-lp.xml
@@ -10,7 +10,7 @@
             <Description/> 
             <Acknowledgement/> 
             <Contact>
-                <PersonID>spase://CNES/Person/S.Buchert</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/S.Buchert</PersonID>
                 <Role>Scientist</Role>
             </Contact> 
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/SWARM-B/Ephemeris/swarmb-orb-tii.xml b/NumericalData/CDPP-AMDA/SWARM-B/Ephemeris/swarmb-orb-tii.xml
index 7da79b2..5716c82 100644
--- a/NumericalData/CDPP-AMDA/SWARM-B/Ephemeris/swarmb-orb-tii.xml
+++ b/NumericalData/CDPP-AMDA/SWARM-B/Ephemeris/swarmb-orb-tii.xml
@@ -10,7 +10,7 @@
             <Description/> 
             <Acknowledgement/> 
              <Contact>
-                <PersonID>spase://CNES/Person/Johnathan.Burchill</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Johnathan.Burchill</PersonID>
                 <Role>Scientist</Role>
             </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/SWARM-B/GNSS/swarmb-gps-all.xml b/NumericalData/CDPP-AMDA/SWARM-B/GNSS/swarmb-gps-all.xml
index 649b347..33f3bb9 100644
--- a/NumericalData/CDPP-AMDA/SWARM-B/GNSS/swarmb-gps-all.xml
+++ b/NumericalData/CDPP-AMDA/SWARM-B/GNSS/swarmb-gps-all.xml
@@ -13,7 +13,7 @@ GNSS signal delay we can estimate slant total electron content (STEC), which is 
 ‘integrated’ electron density along the line of sight from Swarm to GNSS satellites.</Description>
             <Acknowledgement/> 
             <Contact>
-                <PersonID>spase://CNES/Person/R.Haagmans</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/R.Haagmans</PersonID>
                 <Role>ProjectScientist</Role>
             </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/SWARM-B/LP/swarmb-lp-all.xml b/NumericalData/CDPP-AMDA/SWARM-B/LP/swarmb-lp-all.xml
index 6d4a270..2ca572c 100644
--- a/NumericalData/CDPP-AMDA/SWARM-B/LP/swarmb-lp-all.xml
+++ b/NumericalData/CDPP-AMDA/SWARM-B/LP/swarmb-lp-all.xml
@@ -19,7 +19,7 @@ The data are intended for users with some experience and understanding of Langmu
  </Description>
            <Acknowledgement> </Acknowledgement>
            <Contact>
-               <PersonID>spase://CNES/Person/S.Buchert</PersonID>
+               <PersonID>spase://CNES/Person/CDPP-AMDA/S.Buchert</PersonID>
                <Role>Scientist</Role>
            </Contact> 
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/SWARM-B/MAG/swarmb-fac-all.xml b/NumericalData/CDPP-AMDA/SWARM-B/MAG/swarmb-fac-all.xml
index 96907ec..b6b74f7 100644
--- a/NumericalData/CDPP-AMDA/SWARM-B/MAG/swarmb-fac-all.xml
+++ b/NumericalData/CDPP-AMDA/SWARM-B/MAG/swarmb-fac-all.xml
@@ -10,7 +10,7 @@
             <Description/> 
             <Acknowledgement/> 
               <Contact>
-               <PersonID>spase://CNES/Person/P.Ritter</PersonID>
+               <PersonID>spase://CNES/Person/CDPP-AMDA/P.Ritter</PersonID>
                <Role>Scientist</Role>
              </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/SWARM-B/MAG/swarmb-mag-all.xml b/NumericalData/CDPP-AMDA/SWARM-B/MAG/swarmb-mag-all.xml
index 174e644..9891eae 100644
--- a/NumericalData/CDPP-AMDA/SWARM-B/MAG/swarmb-mag-all.xml
+++ b/NumericalData/CDPP-AMDA/SWARM-B/MAG/swarmb-mag-all.xml
@@ -10,7 +10,7 @@
             <Description/> 
             <Acknowledgement/> 
             <Contact>
-               <PersonID>spase://CNES/Person/G.Hulot</PersonID>
+               <PersonID>spase://CNES/Person/CDPP-AMDA/G.Hulot</PersonID>
                <Role>PrincipalInvestigator</Role>
            </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/SWARM-B/MAG/swarmb-mag-tii.xml b/NumericalData/CDPP-AMDA/SWARM-B/MAG/swarmb-mag-tii.xml
index db10130..30ca760 100644
--- a/NumericalData/CDPP-AMDA/SWARM-B/MAG/swarmb-mag-tii.xml
+++ b/NumericalData/CDPP-AMDA/SWARM-B/MAG/swarmb-mag-tii.xml
@@ -10,7 +10,7 @@
             <Description></Description>
             <Acknowledgement></Acknowledgement>
             <Contact>
-                <PersonID>spase://CNES/Person/Johnathan.Burchill</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Johnathan.Burchill</PersonID>
                 <Role>Scientist</Role>
             </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/SWARM-B/TII/swarmb-tii-all.xml b/NumericalData/CDPP-AMDA/SWARM-B/TII/swarmb-tii-all.xml
index 06591e3..baf2b90 100644
--- a/NumericalData/CDPP-AMDA/SWARM-B/TII/swarmb-tii-all.xml
+++ b/NumericalData/CDPP-AMDA/SWARM-B/TII/swarmb-tii-all.xml
@@ -10,7 +10,7 @@
             <Description/> 
             <Acknowledgement/> 
             <Contact>
-                <PersonID>spase://CNES/Person/Johnathan.Burchill</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Johnathan.Burchill</PersonID>
                 <Role>Scientist</Role>
             </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/SWARM-B/TII/swarmb-tii-prov.xml b/NumericalData/CDPP-AMDA/SWARM-B/TII/swarmb-tii-prov.xml
index 17e3f24..68760ee 100644
--- a/NumericalData/CDPP-AMDA/SWARM-B/TII/swarmb-tii-prov.xml
+++ b/NumericalData/CDPP-AMDA/SWARM-B/TII/swarmb-tii-prov.xml
@@ -10,7 +10,7 @@
             <Description></Description>
             <Acknowledgement></Acknowledgement>
             <Contact>
-                <PersonID>spase://CNES/Person/Johnathan.Burchill</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Johnathan.Burchill</PersonID>
                 <Role>Scientist</Role>
             </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/SWARM-C/Ephemeris/swarmc-orb-all.xml b/NumericalData/CDPP-AMDA/SWARM-C/Ephemeris/swarmc-orb-all.xml
index fae0219..ca0d24f 100644
--- a/NumericalData/CDPP-AMDA/SWARM-C/Ephemeris/swarmc-orb-all.xml
+++ b/NumericalData/CDPP-AMDA/SWARM-C/Ephemeris/swarmc-orb-all.xml
@@ -10,7 +10,7 @@
             <Description/> 
             <Acknowledgement/> 
              <Contact>
-                <PersonID>spase://CNES/Person/R.Haagmans</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/R.Haagmans</PersonID>
                 <Role>ProjectScientist</Role>
             </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/SWARM-C/Ephemeris/swarmc-orb-lp.xml b/NumericalData/CDPP-AMDA/SWARM-C/Ephemeris/swarmc-orb-lp.xml
index fe2ead8..36868ba 100644
--- a/NumericalData/CDPP-AMDA/SWARM-C/Ephemeris/swarmc-orb-lp.xml
+++ b/NumericalData/CDPP-AMDA/SWARM-C/Ephemeris/swarmc-orb-lp.xml
@@ -10,7 +10,7 @@
             <Description/> 
             <Acknowledgement/> 
             <Contact>
-                <PersonID>spase://CNES/Person/S.Buchert</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/S.Buchert</PersonID>
                 <Role>Scientist</Role>
             </Contact> 
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/SWARM-C/Ephemeris/swarmc-orb-tii.xml b/NumericalData/CDPP-AMDA/SWARM-C/Ephemeris/swarmc-orb-tii.xml
index e78bc7f..7083f2a 100644
--- a/NumericalData/CDPP-AMDA/SWARM-C/Ephemeris/swarmc-orb-tii.xml
+++ b/NumericalData/CDPP-AMDA/SWARM-C/Ephemeris/swarmc-orb-tii.xml
@@ -10,7 +10,7 @@
             <Description/> 
             <Acknowledgement/> 
              <Contact>
-                <PersonID>spase://CNES/Person/Johnathan.Burchill</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Johnathan.Burchill</PersonID>
                 <Role>Scientist</Role>
             </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/SWARM-C/GNSS/swarmc-gps-all.xml b/NumericalData/CDPP-AMDA/SWARM-C/GNSS/swarmc-gps-all.xml
index ad251b3..2b9e4c4 100644
--- a/NumericalData/CDPP-AMDA/SWARM-C/GNSS/swarmc-gps-all.xml
+++ b/NumericalData/CDPP-AMDA/SWARM-C/GNSS/swarmc-gps-all.xml
@@ -13,7 +13,7 @@ GNSS signal delay we can estimate slant total electron content (STEC), which is 
 ‘integrated’ electron density along the line of sight from Swarm to GNSS satellites.</Description>
             <Acknowledgement/> 
             <Contact>
-                <PersonID>spase://CNES/Person/R.Haagmans</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/R.Haagmans</PersonID>
                 <Role>ProjectScientist</Role>
             </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/SWARM-C/LP/swarmc-lp-all.xml b/NumericalData/CDPP-AMDA/SWARM-C/LP/swarmc-lp-all.xml
index fc4257c..595a399 100644
--- a/NumericalData/CDPP-AMDA/SWARM-C/LP/swarmc-lp-all.xml
+++ b/NumericalData/CDPP-AMDA/SWARM-C/LP/swarmc-lp-all.xml
@@ -19,7 +19,7 @@ The data are intended for users with some experience and understanding of Langmu
  </Description>
            <Acknowledgement> </Acknowledgement>
            <Contact>
-               <PersonID>spase://CNES/Person/S.Buchert</PersonID>
+               <PersonID>spase://CNES/Person/CDPP-AMDA/S.Buchert</PersonID>
                <Role>Scientist</Role>
            </Contact> 
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/SWARM-C/MAG/swarmc-fac-all.xml b/NumericalData/CDPP-AMDA/SWARM-C/MAG/swarmc-fac-all.xml
index b7e5670..b9038ac 100644
--- a/NumericalData/CDPP-AMDA/SWARM-C/MAG/swarmc-fac-all.xml
+++ b/NumericalData/CDPP-AMDA/SWARM-C/MAG/swarmc-fac-all.xml
@@ -10,7 +10,7 @@
             <Description> </Description>
             <Acknowledgement> </Acknowledgement>
               <Contact>
-               <PersonID>spase://CNES/Person/P.Ritter</PersonID>
+               <PersonID>spase://CNES/Person/CDPP-AMDA/P.Ritter</PersonID>
                <Role>Scientist</Role>
              </Contact>
            <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/SWARM-C/MAG/swarmc-mag-all.xml b/NumericalData/CDPP-AMDA/SWARM-C/MAG/swarmc-mag-all.xml
index 53ece06..ff3d5a2 100644
--- a/NumericalData/CDPP-AMDA/SWARM-C/MAG/swarmc-mag-all.xml
+++ b/NumericalData/CDPP-AMDA/SWARM-C/MAG/swarmc-mag-all.xml
@@ -10,7 +10,7 @@
             <Description/> 
             <Acknowledgement/> 
              <Contact>
-               <PersonID>spase://CNES/Person/G.Hulot</PersonID>
+               <PersonID>spase://CNES/Person/CDPP-AMDA/G.Hulot</PersonID>
                <Role>PrincipalInvestigator</Role>
            </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/SWARM-C/MAG/swarmc-mag-tii.xml b/NumericalData/CDPP-AMDA/SWARM-C/MAG/swarmc-mag-tii.xml
index dce9fcf..c8d12de 100644
--- a/NumericalData/CDPP-AMDA/SWARM-C/MAG/swarmc-mag-tii.xml
+++ b/NumericalData/CDPP-AMDA/SWARM-C/MAG/swarmc-mag-tii.xml
@@ -10,7 +10,7 @@
             <Description></Description>
             <Acknowledgement></Acknowledgement>
             <Contact>
-                <PersonID>spase://CNES/Person/Johnathan.Burchill</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Johnathan.Burchill</PersonID>
                 <Role>Scientist</Role>
             </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/SWARM-C/TII/swarmc-tii-all.xml b/NumericalData/CDPP-AMDA/SWARM-C/TII/swarmc-tii-all.xml
index ec8d7f3..00632bd 100644
--- a/NumericalData/CDPP-AMDA/SWARM-C/TII/swarmc-tii-all.xml
+++ b/NumericalData/CDPP-AMDA/SWARM-C/TII/swarmc-tii-all.xml
@@ -10,7 +10,7 @@
             <Description/>
             <Acknowledgement/> 
              <Contact>
-                <PersonID>spase://CNES/Person/Johnathan.Burchill</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Johnathan.Burchill</PersonID>
                 <Role>Scientist</Role>
             </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/SWARM-C/TII/swarmc-tii-prov.xml b/NumericalData/CDPP-AMDA/SWARM-C/TII/swarmc-tii-prov.xml
index 79d66f4..bcfa0bb 100644
--- a/NumericalData/CDPP-AMDA/SWARM-C/TII/swarmc-tii-prov.xml
+++ b/NumericalData/CDPP-AMDA/SWARM-C/TII/swarmc-tii-prov.xml
@@ -10,7 +10,7 @@
             <Description></Description>
             <Acknowledgement></Acknowledgement>
             <Contact>
-                <PersonID>spase://CNES/Person/Johnathan.Burchill</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Johnathan.Burchill</PersonID>
                 <Role>Scientist</Role>
             </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-ept-anti.xml b/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-ept-anti.xml
index 3430160..3fc6f0e 100644
--- a/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-ept-anti.xml
+++ b/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-ept-anti.xml
@@ -25,7 +25,7 @@ Additionally, EPT has 2 channels that separate electrons and ions:
           </Description>
           <Acknowledgement>See http://espada.uah.es/epd/EPD_data.php</Acknowledgement>
          <Contact>
-             <PersonID>spase://CNES/Person/J.Rodrigues-Pacheco</PersonID>
+             <PersonID>spase://CNES/Person/CDPP-AMDA/J.Rodrigues-Pacheco</PersonID>
            <Role>PrincipalInvestigator</Role>
          </Contact>         
           <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-ept-e.anti.xml b/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-ept-e.anti.xml
index b0abaa3..b7e7b00 100644
--- a/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-ept-e.anti.xml
+++ b/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-ept-e.anti.xml
@@ -25,7 +25,7 @@ Additionally, EPT has 2 channels that separate electrons and ions:
           </Description>
           <Acknowledgement>See http://espada.uah.es/epd/EPD_data.php</Acknowledgement>
          <Contact>
-             <PersonID>spase://CNES/Person/J.Rodrigues-Pacheco</PersonID>
+             <PersonID>spase://CNES/Person/CDPP-AMDA/J.Rodrigues-Pacheco</PersonID>
            <Role>PrincipalInvestigator</Role>
          </Contact>         
           <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-ept-e.north.xml b/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-ept-e.north.xml
index 87f8bc2..3895293 100644
--- a/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-ept-e.north.xml
+++ b/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-ept-e.north.xml
@@ -25,7 +25,7 @@ Additionally, EPT has 2 channels that separate electrons and ions:
           </Description>
           <Acknowledgement>See http://espada.uah.es/epd/EPD_data.php</Acknowledgement>
          <Contact>
-             <PersonID>spase://CNES/Person/J.Rodrigues-Pacheco</PersonID>
+             <PersonID>spase://CNES/Person/CDPP-AMDA/J.Rodrigues-Pacheco</PersonID>
            <Role>PrincipalInvestigator</Role>
          </Contact>         
           <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-ept-e.south.xml b/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-ept-e.south.xml
index 9a147e4..d368e1d 100644
--- a/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-ept-e.south.xml
+++ b/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-ept-e.south.xml
@@ -25,7 +25,7 @@ Additionally, EPT has 2 channels that separate electrons and ions:
           </Description>
           <Acknowledgement>See http://espada.uah.es/epd/EPD_data.php</Acknowledgement>
          <Contact>
-             <PersonID>spase://CNES/Person/J.Rodrigues-Pacheco</PersonID>
+             <PersonID>spase://CNES/Person/CDPP-AMDA/J.Rodrigues-Pacheco</PersonID>
            <Role>PrincipalInvestigator</Role>
          </Contact>         
           <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-ept-e.sun.xml b/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-ept-e.sun.xml
index 6f6551c..e0e8c29 100644
--- a/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-ept-e.sun.xml
+++ b/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-ept-e.sun.xml
@@ -25,7 +25,7 @@ Additionally, EPT has 2 channels that separate electrons and ions:
           </Description>
           <Acknowledgement>See http://espada.uah.es/epd/EPD_data.php</Acknowledgement>
          <Contact>
-             <PersonID>spase://CNES/Person/J.Rodrigues-Pacheco</PersonID>
+             <PersonID>spase://CNES/Person/CDPP-AMDA/J.Rodrigues-Pacheco</PersonID>
            <Role>PrincipalInvestigator</Role>
          </Contact>         
           <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-ept-e.total.xml b/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-ept-e.total.xml
index 9d15c89..c7421cf 100644
--- a/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-ept-e.total.xml
+++ b/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-ept-e.total.xml
@@ -23,7 +23,7 @@ Additionally, EPT has 2 channels that separate electrons and ions:
           </Description>
           <Acknowledgement>See http://espada.uah.es/epd/EPD_data.php</Acknowledgement>
          <Contact>
-             <PersonID>spase://CNES/Person/J.Rodrigues-Pacheco</PersonID>
+             <PersonID>spase://CNES/Person/CDPP-AMDA/J.Rodrigues-Pacheco</PersonID>
            <Role>PrincipalInvestigator</Role>
          </Contact>         
           <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-ept-north.xml b/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-ept-north.xml
index dbfa34b..be03c6e 100644
--- a/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-ept-north.xml
+++ b/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-ept-north.xml
@@ -25,7 +25,7 @@ Additionally, EPT has 2 channels that separate electrons and ions:
           </Description>
           <Acknowledgement>See http://espada.uah.es/epd/EPD_data.php</Acknowledgement>
          <Contact>
-             <PersonID>spase://CNES/Person/J.Rodrigues-Pacheco</PersonID>
+             <PersonID>spase://CNES/Person/CDPP-AMDA/J.Rodrigues-Pacheco</PersonID>
            <Role>PrincipalInvestigator</Role>
          </Contact>         
           <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-ept-south.xml b/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-ept-south.xml
index 79c181a..aa08b08 100644
--- a/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-ept-south.xml
+++ b/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-ept-south.xml
@@ -26,7 +26,7 @@ Additionally, EPT has 2 channels that separate electrons and ions:
           </Description>
           <Acknowledgement>See http://espada.uah.es/epd/EPD_data.php</Acknowledgement>
          <Contact>
-             <PersonID>spase://CNES/Person/J.Rodrigues-Pacheco</PersonID>
+             <PersonID>spase://CNES/Person/CDPP-AMDA/J.Rodrigues-Pacheco</PersonID>
            <Role>PrincipalInvestigator</Role>
          </Contact>         
           <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-ept-sun.xml b/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-ept-sun.xml
index 59170a5..4a2cc98 100644
--- a/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-ept-sun.xml
+++ b/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-ept-sun.xml
@@ -25,7 +25,7 @@ Additionally, EPT has 2 channels that separate electrons and ions:
           </Description>
           <Acknowledgement>See http://espada.uah.es/epd/EPD_data.php</Acknowledgement>
          <Contact>
-             <PersonID>spase://CNES/Person/J.Rodrigues-Pacheco</PersonID>
+             <PersonID>spase://CNES/Person/CDPP-AMDA/J.Rodrigues-Pacheco</PersonID>
            <Role>PrincipalInvestigator</Role>
          </Contact>         
           <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-ept-total.xml b/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-ept-total.xml
index c1f686d..9682528 100644
--- a/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-ept-total.xml
+++ b/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-ept-total.xml
@@ -22,7 +22,7 @@
                 * Foil channel. Equipped with a foil that absorbs ions, it measures electrons in the energy range 25–500 keV. Ions with energies above 400 keV can penetrate the foil, contaminating the electron measurements.</Description>
             <Acknowledgement>See http://espada.uah.es/epd/EPD_data.php</Acknowledgement>
             <Contact>
-                <PersonID>spase://CNES/Person/J.Rodrigues-Pacheco</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/J.Rodrigues-Pacheco</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-het-anti.1.xml b/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-het-anti.1.xml
index e7c10b2..732140f 100644
--- a/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-het-anti.1.xml
+++ b/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-het-anti.1.xml
@@ -19,7 +19,7 @@ Parameter ID uses Detector looking directon.
           </Description>
           <Acknowledgement>See http://espada.uah.es/epd/EPD_data.php</Acknowledgement>
          <Contact>
-             <PersonID>spase://CNES/Person/J.Rodrigues-Pacheco</PersonID>
+             <PersonID>spase://CNES/Person/CDPP-AMDA/J.Rodrigues-Pacheco</PersonID>
            <Role>PrincipalInvestigator</Role>
          </Contact>         
           <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-het-anti.2.xml b/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-het-anti.2.xml
index 3088a16..227c317 100644
--- a/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-het-anti.2.xml
+++ b/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-het-anti.2.xml
@@ -19,7 +19,7 @@ Parameter ID uses Detector looking directon.
           </Description>
           <Acknowledgement>See http://espada.uah.es/epd/EPD_data.php</Acknowledgement>
          <Contact>
-             <PersonID>spase://CNES/Person/J.Rodrigues-Pacheco</PersonID>
+             <PersonID>spase://CNES/Person/CDPP-AMDA/J.Rodrigues-Pacheco</PersonID>
            <Role>PrincipalInvestigator</Role>
          </Contact>         
           <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-het-anti.3.xml b/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-het-anti.3.xml
index b84b5a9..c3e0602 100644
--- a/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-het-anti.3.xml
+++ b/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-het-anti.3.xml
@@ -19,7 +19,7 @@ Parameter ID uses Detector looking directon.
           </Description>
           <Acknowledgement>See http://espada.uah.es/epd/EPD_data.php</Acknowledgement>
          <Contact>
-             <PersonID>spase://CNES/Person/J.Rodrigues-Pacheco</PersonID>
+             <PersonID>spase://CNES/Person/CDPP-AMDA/J.Rodrigues-Pacheco</PersonID>
            <Role>PrincipalInvestigator</Role>
          </Contact>         
           <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-het-anti.4.xml b/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-het-anti.4.xml
index a38b832..4c26027 100644
--- a/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-het-anti.4.xml
+++ b/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-het-anti.4.xml
@@ -19,7 +19,7 @@ Parameter ID uses Detector looking directon.
           </Description>
           <Acknowledgement>See http://espada.uah.es/epd/EPD_data.php</Acknowledgement>
          <Contact>
-             <PersonID>spase://CNES/Person/J.Rodrigues-Pacheco</PersonID>
+             <PersonID>spase://CNES/Person/CDPP-AMDA/J.Rodrigues-Pacheco</PersonID>
            <Role>PrincipalInvestigator</Role>
          </Contact>         
           <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-het-anti.xml b/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-het-anti.xml
index 390d24e..eb87c4d 100644
--- a/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-het-anti.xml
+++ b/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-het-anti.xml
@@ -20,7 +20,7 @@ Parameter ID uses Detector looking directon.
           </Description>
           <Acknowledgement>See http://espada.uah.es/epd/EPD_data.php</Acknowledgement>
          <Contact>
-             <PersonID>spase://CNES/Person/J.Rodrigues-Pacheco</PersonID>
+             <PersonID>spase://CNES/Person/CDPP-AMDA/J.Rodrigues-Pacheco</PersonID>
            <Role>PrincipalInvestigator</Role>
          </Contact>         
           <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-het-north.1.xml b/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-het-north.1.xml
index e511462..e8a9d07 100644
--- a/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-het-north.1.xml
+++ b/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-het-north.1.xml
@@ -19,7 +19,7 @@ Parameter ID uses Detector looking directon.
           </Description>
           <Acknowledgement>See http://espada.uah.es/epd/EPD_data.php</Acknowledgement>
          <Contact>
-             <PersonID>spase://CNES/Person/J.Rodrigues-Pacheco</PersonID>
+             <PersonID>spase://CNES/Person/CDPP-AMDA/J.Rodrigues-Pacheco</PersonID>
            <Role>PrincipalInvestigator</Role>
          </Contact>         
           <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-het-north.2.xml b/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-het-north.2.xml
index 59d90ec..69ec119 100644
--- a/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-het-north.2.xml
+++ b/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-het-north.2.xml
@@ -19,7 +19,7 @@ Parameter ID uses Detector looking directon.
           </Description>
           <Acknowledgement>See http://espada.uah.es/epd/EPD_data.php</Acknowledgement>
          <Contact>
-             <PersonID>spase://CNES/Person/J.Rodrigues-Pacheco</PersonID>
+             <PersonID>spase://CNES/Person/CDPP-AMDA/J.Rodrigues-Pacheco</PersonID>
            <Role>PrincipalInvestigator</Role>
          </Contact>         
           <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-het-north.3.xml b/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-het-north.3.xml
index 03b84e7..44282a5 100644
--- a/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-het-north.3.xml
+++ b/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-het-north.3.xml
@@ -19,7 +19,7 @@ Parameter ID uses Detector looking directon.
           </Description>
           <Acknowledgement>See http://espada.uah.es/epd/EPD_data.php</Acknowledgement>
          <Contact>
-             <PersonID>spase://CNES/Person/J.Rodrigues-Pacheco</PersonID>
+             <PersonID>spase://CNES/Person/CDPP-AMDA/J.Rodrigues-Pacheco</PersonID>
            <Role>PrincipalInvestigator</Role>
          </Contact>         
           <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-het-north.4.xml b/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-het-north.4.xml
index d4b4e3a..80b5558 100644
--- a/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-het-north.4.xml
+++ b/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-het-north.4.xml
@@ -19,7 +19,7 @@ Parameter ID uses Detector looking directon.
           </Description>
           <Acknowledgement>See http://espada.uah.es/epd/EPD_data.php</Acknowledgement>
          <Contact>
-             <PersonID>spase://CNES/Person/J.Rodrigues-Pacheco</PersonID>
+             <PersonID>spase://CNES/Person/CDPP-AMDA/J.Rodrigues-Pacheco</PersonID>
            <Role>PrincipalInvestigator</Role>
          </Contact>         
           <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-het-north.xml b/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-het-north.xml
index dcc6fdc..3952a0e 100644
--- a/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-het-north.xml
+++ b/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-het-north.xml
@@ -19,7 +19,7 @@ Parameter ID uses Detector looking directon.
           </Description>
           <Acknowledgement>See http://espada.uah.es/epd/EPD_data.php</Acknowledgement>
          <Contact>
-             <PersonID>spase://CNES/Person/J.Rodrigues-Pacheco</PersonID>
+             <PersonID>spase://CNES/Person/CDPP-AMDA/J.Rodrigues-Pacheco</PersonID>
            <Role>PrincipalInvestigator</Role>
          </Contact>         
           <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-het-south.1.xml b/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-het-south.1.xml
index 2751ae9..552d9df 100644
--- a/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-het-south.1.xml
+++ b/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-het-south.1.xml
@@ -20,7 +20,7 @@ Parameter ID uses Detector looking directon.
           </Description>
           <Acknowledgement>See http://espada.uah.es/epd/EPD_data.php</Acknowledgement>
          <Contact>
-             <PersonID>spase://CNES/Person/J.Rodrigues-Pacheco</PersonID>
+             <PersonID>spase://CNES/Person/CDPP-AMDA/J.Rodrigues-Pacheco</PersonID>
            <Role>PrincipalInvestigator</Role>
          </Contact>         
           <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-het-south.2.xml b/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-het-south.2.xml
index dee8a34..234c990 100644
--- a/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-het-south.2.xml
+++ b/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-het-south.2.xml
@@ -19,7 +19,7 @@ Parameter ID uses Detector looking directon.
           </Description>
           <Acknowledgement>See http://espada.uah.es/epd/EPD_data.php</Acknowledgement>
          <Contact>
-             <PersonID>spase://CNES/Person/J.Rodrigues-Pacheco</PersonID>
+             <PersonID>spase://CNES/Person/CDPP-AMDA/J.Rodrigues-Pacheco</PersonID>
            <Role>PrincipalInvestigator</Role>
          </Contact>         
           <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-het-south.3.xml b/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-het-south.3.xml
index e887a4a..438eb63 100644
--- a/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-het-south.3.xml
+++ b/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-het-south.3.xml
@@ -19,7 +19,7 @@ Parameter ID uses Detector looking directon.
           </Description>
           <Acknowledgement>See http://espada.uah.es/epd/EPD_data.php</Acknowledgement>
          <Contact>
-             <PersonID>spase://CNES/Person/J.Rodrigues-Pacheco</PersonID>
+             <PersonID>spase://CNES/Person/CDPP-AMDA/J.Rodrigues-Pacheco</PersonID>
            <Role>PrincipalInvestigator</Role>
          </Contact>         
           <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-het-south.4.xml b/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-het-south.4.xml
index c257cb5..1b6940d 100644
--- a/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-het-south.4.xml
+++ b/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-het-south.4.xml
@@ -19,7 +19,7 @@ Parameter ID uses Detector looking directon.
           </Description>
           <Acknowledgement>See http://espada.uah.es/epd/EPD_data.php</Acknowledgement>
          <Contact>
-             <PersonID>spase://CNES/Person/J.Rodrigues-Pacheco</PersonID>
+             <PersonID>spase://CNES/Person/CDPP-AMDA/J.Rodrigues-Pacheco</PersonID>
            <Role>PrincipalInvestigator</Role>
          </Contact>         
           <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-het-south.xml b/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-het-south.xml
index 88e68ed..ab38318 100644
--- a/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-het-south.xml
+++ b/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-het-south.xml
@@ -19,7 +19,7 @@ Parameter ID suffix is Detector looking directon.
           </Description>
           <Acknowledgement>See http://espada.uah.es/epd/EPD_data.php</Acknowledgement>
          <Contact>
-             <PersonID>spase://CNES/Person/J.Rodrigues-Pacheco</PersonID>
+             <PersonID>spase://CNES/Person/CDPP-AMDA/J.Rodrigues-Pacheco</PersonID>
            <Role>PrincipalInvestigator</Role>
          </Contact>         
           <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-het-sun.1.xml b/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-het-sun.1.xml
index ec17f9d..0c58556 100644
--- a/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-het-sun.1.xml
+++ b/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-het-sun.1.xml
@@ -19,7 +19,7 @@ Parameter ID uses Detector looking directon.
           </Description>
           <Acknowledgement>See http://espada.uah.es/epd/EPD_data.php</Acknowledgement>
          <Contact>
-             <PersonID>spase://CNES/Person/J.Rodrigues-Pacheco</PersonID>
+             <PersonID>spase://CNES/Person/CDPP-AMDA/J.Rodrigues-Pacheco</PersonID>
            <Role>PrincipalInvestigator</Role>
          </Contact>         
           <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-het-sun.2.xml b/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-het-sun.2.xml
index 661a267..ea87cf3 100644
--- a/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-het-sun.2.xml
+++ b/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-het-sun.2.xml
@@ -19,7 +19,7 @@ Parameter ID uses Detector looking directon.
           </Description>
           <Acknowledgement>See http://espada.uah.es/epd/EPD_data.php</Acknowledgement>
          <Contact>
-             <PersonID>spase://CNES/Person/J.Rodrigues-Pacheco</PersonID>
+             <PersonID>spase://CNES/Person/CDPP-AMDA/J.Rodrigues-Pacheco</PersonID>
            <Role>PrincipalInvestigator</Role>
          </Contact>         
           <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-het-sun.3.xml b/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-het-sun.3.xml
index 10ab2dd..1534d8f 100644
--- a/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-het-sun.3.xml
+++ b/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-het-sun.3.xml
@@ -19,7 +19,7 @@ Parameter ID uses Detector looking directon.
           </Description>
           <Acknowledgement>See http://espada.uah.es/epd/EPD_data.php</Acknowledgement>
          <Contact>
-             <PersonID>spase://CNES/Person/J.Rodrigues-Pacheco</PersonID>
+             <PersonID>spase://CNES/Person/CDPP-AMDA/J.Rodrigues-Pacheco</PersonID>
            <Role>PrincipalInvestigator</Role>
          </Contact>         
           <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-het-sun.4.xml b/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-het-sun.4.xml
index 74d6354..bdf863b 100644
--- a/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-het-sun.4.xml
+++ b/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-het-sun.4.xml
@@ -19,7 +19,7 @@ Parameter ID uses Detector looking directon.
           </Description>
           <Acknowledgement>See http://espada.uah.es/epd/EPD_data.php</Acknowledgement>
          <Contact>
-             <PersonID>spase://CNES/Person/J.Rodrigues-Pacheco</PersonID>
+             <PersonID>spase://CNES/Person/CDPP-AMDA/J.Rodrigues-Pacheco</PersonID>
            <Role>PrincipalInvestigator</Role>
          </Contact>         
           <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-het-sun.xml b/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-het-sun.xml
index 9828208..761144a 100644
--- a/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-het-sun.xml
+++ b/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-het-sun.xml
@@ -19,7 +19,7 @@ Parameter ID uses Detector looking directon.
           </Description>
           <Acknowledgement>See http://espada.uah.es/epd/EPD_data.php</Acknowledgement>
          <Contact>
-             <PersonID>spase://CNES/Person/J.Rodrigues-Pacheco</PersonID>
+             <PersonID>spase://CNES/Person/CDPP-AMDA/J.Rodrigues-Pacheco</PersonID>
            <Role>PrincipalInvestigator</Role>
          </Contact>         
           <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-het-total.1.xml b/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-het-total.1.xml
index aa16cbd..5066e3d 100644
--- a/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-het-total.1.xml
+++ b/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-het-total.1.xml
@@ -17,7 +17,7 @@ Anti-Sun, North and South)
           </Description>
           <Acknowledgement>See http://espada.uah.es/epd/EPD_data.php</Acknowledgement>
          <Contact>
-             <PersonID>spase://CNES/Person/J.Rodrigues-Pacheco</PersonID>
+             <PersonID>spase://CNES/Person/CDPP-AMDA/J.Rodrigues-Pacheco</PersonID>
            <Role>PrincipalInvestigator</Role>
          </Contact>         
           <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-het-total.2.xml b/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-het-total.2.xml
index 05c0018..5082d00 100644
--- a/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-het-total.2.xml
+++ b/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-het-total.2.xml
@@ -17,7 +17,7 @@ Anti-Sun, North and South)
           </Description>
           <Acknowledgement>See http://espada.uah.es/epd/EPD_data.php</Acknowledgement>
          <Contact>
-             <PersonID>spase://CNES/Person/J.Rodrigues-Pacheco</PersonID>
+             <PersonID>spase://CNES/Person/CDPP-AMDA/J.Rodrigues-Pacheco</PersonID>
            <Role>PrincipalInvestigator</Role>
          </Contact>         
           <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-het-total.3.xml b/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-het-total.3.xml
index 83dc499..338f108 100644
--- a/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-het-total.3.xml
+++ b/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-het-total.3.xml
@@ -17,7 +17,7 @@ Anti-Sun, North and South)
           </Description>
           <Acknowledgement>See http://espada.uah.es/epd/EPD_data.php</Acknowledgement>
          <Contact>
-             <PersonID>spase://CNES/Person/J.Rodrigues-Pacheco</PersonID>
+             <PersonID>spase://CNES/Person/CDPP-AMDA/J.Rodrigues-Pacheco</PersonID>
            <Role>PrincipalInvestigator</Role>
          </Contact>         
           <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-het-total.4.xml b/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-het-total.4.xml
index 235fc5f..75fb737 100644
--- a/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-het-total.4.xml
+++ b/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-het-total.4.xml
@@ -17,7 +17,7 @@ Anti-Sun, North and South)
           </Description>
           <Acknowledgement>See http://espada.uah.es/epd/EPD_data.php</Acknowledgement>
          <Contact>
-             <PersonID>spase://CNES/Person/J.Rodrigues-Pacheco</PersonID>
+             <PersonID>spase://CNES/Person/CDPP-AMDA/J.Rodrigues-Pacheco</PersonID>
            <Role>PrincipalInvestigator</Role>
          </Contact>         
           <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-het-total.xml b/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-het-total.xml
index e53bc69..7d3a7e6 100644
--- a/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-het-total.xml
+++ b/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-het-total.xml
@@ -17,7 +17,7 @@ Anti-Sun, North and South)
           </Description>
           <Acknowledgement>See http://espada.uah.es/epd/EPD_data.php</Acknowledgement>
          <Contact>
-             <PersonID>spase://CNES/Person/J.Rodrigues-Pacheco</PersonID>
+             <PersonID>spase://CNES/Person/CDPP-AMDA/J.Rodrigues-Pacheco</PersonID>
            <Role>PrincipalInvestigator</Role>
          </Contact>         
           <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-step-rates.xml b/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-step-rates.xml
index d7fc441..809fd50 100644
--- a/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-step-rates.xml
+++ b/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-step-rates.xml
@@ -21,7 +21,7 @@
           exposed to the incoming flux, measures the cosmic ray background.</Description>
           <Acknowledgement>See http://espada.uah.es/epd/EPD_data.php</Acknowledgement>
          <Contact>
-             <PersonID>spase://CNES/Person/J.Rodrigues-Pacheco</PersonID>
+             <PersonID>spase://CNES/Person/CDPP-AMDA/J.Rodrigues-Pacheco</PersonID>
            <Role>PrincipalInvestigator</Role>
          </Contact>         
           <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-step-rtn.xml b/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-step-rtn.xml
index 1a79c44..4eff6ef 100644
--- a/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-step-rtn.xml
+++ b/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/so-step-rtn.xml
@@ -10,7 +10,7 @@
           <Description>Solar Orbiter, Level 2 Data, Energetic Particle Detector, SupraThermal Electrons and Protons, Rates.</Description>
           <Acknowledgement>See http://espada.uah.es/epd/EPD_data.php</Acknowledgement>
          <Contact>
-             <PersonID>spase://CNES/Person/J.Rodrigues-Pacheco</PersonID>
+             <PersonID>spase://CNES/Person/CDPP-AMDA/J.Rodrigues-Pacheco</PersonID>
            <Role>PrincipalInvestigator</Role>
          </Contact>         
           <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/solo-sisa-slow.xml b/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/solo-sisa-slow.xml
index d418eee..b86e91e 100644
--- a/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/solo-sisa-slow.xml
+++ b/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/solo-sisa-slow.xml
@@ -19,7 +19,7 @@
           </Description>
           <Acknowledgement>See http://espada.uah.es/epd/EPD_data.php</Acknowledgement>
          <Contact>
-             <PersonID>spase://CNES/Person/J.Rodrigues-Pacheco</PersonID>
+             <PersonID>spase://CNES/Person/CDPP-AMDA/J.Rodrigues-Pacheco</PersonID>
            <Role>PrincipalInvestigator</Role>
          </Contact>         
           <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/solo-sisb-slow.xml b/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/solo-sisb-slow.xml
index 6ba6c8a..e20cf66 100644
--- a/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/solo-sisb-slow.xml
+++ b/NumericalData/CDPP-AMDA/Solar_Orbiter/EPD/solo-sisb-slow.xml
@@ -19,7 +19,7 @@
           </Description>
           <Acknowledgement>See http://espada.uah.es/epd/EPD_data.php</Acknowledgement>
          <Contact>
-             <PersonID>spase://CNES/Person/J.Rodrigues-Pacheco</PersonID>
+             <PersonID>spase://CNES/Person/CDPP-AMDA/J.Rodrigues-Pacheco</PersonID>
            <Role>PrincipalInvestigator</Role>
          </Contact>         
           <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Solar_Orbiter/Ephemeris/so-orb-all.xml b/NumericalData/CDPP-AMDA/Solar_Orbiter/Ephemeris/so-orb-all.xml
index 71d101b..994da82 100644
--- a/NumericalData/CDPP-AMDA/Solar_Orbiter/Ephemeris/so-orb-all.xml
+++ b/NumericalData/CDPP-AMDA/Solar_Orbiter/Ephemeris/so-orb-all.xml
@@ -11,7 +11,7 @@
          <Description>Calculated at IRAP using SPICE kernels</Description>
          <Acknowledgement/>                  
          <Contact>
-            <PersonID>spase://CNES/Person/Elena.Budnik</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Elena.Budnik</PersonID>
             <Role>DataProducer</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Solar_Orbiter/Ephemeris/so-orb-venus1.xml b/NumericalData/CDPP-AMDA/Solar_Orbiter/Ephemeris/so-orb-venus1.xml
index e9e5c3a..fb4255f 100644
--- a/NumericalData/CDPP-AMDA/Solar_Orbiter/Ephemeris/so-orb-venus1.xml
+++ b/NumericalData/CDPP-AMDA/Solar_Orbiter/Ephemeris/so-orb-venus1.xml
@@ -11,7 +11,7 @@
          <Description>Calculated at IRAP using SPICE kernels</Description>
          <Acknowledgement/>                  
          <Contact>
-            <PersonID>spase://CNES/Person/Elena.Budnik</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Elena.Budnik</PersonID>
             <Role>DataProducer</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Solar_Orbiter/Ephemeris/so-orb-venus2.xml b/NumericalData/CDPP-AMDA/Solar_Orbiter/Ephemeris/so-orb-venus2.xml
index fe02f47..2e8a67c 100644
--- a/NumericalData/CDPP-AMDA/Solar_Orbiter/Ephemeris/so-orb-venus2.xml
+++ b/NumericalData/CDPP-AMDA/Solar_Orbiter/Ephemeris/so-orb-venus2.xml
@@ -11,7 +11,7 @@
          <Description>Calculated at IRAP using SPICE kernels</Description>
          <Acknowledgement/>                  
          <Contact>
-            <PersonID>spase://CNES/Person/Elena.Budnik</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Elena.Budnik</PersonID>
             <Role>DataProducer</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Solar_Orbiter/MAG/so-mag-1min.xml b/NumericalData/CDPP-AMDA/Solar_Orbiter/MAG/so-mag-1min.xml
index cff112f..203ead8 100644
--- a/NumericalData/CDPP-AMDA/Solar_Orbiter/MAG/so-mag-1min.xml
+++ b/NumericalData/CDPP-AMDA/Solar_Orbiter/MAG/so-mag-1min.xml
@@ -10,7 +10,7 @@
           <Description>Publication quality. Take note of Quality Flag and refer to SOL-MAG-DPDD for exceptions ( see SolO Archive Support Data)</Description>
           <Acknowledgement>Solar Orbiter magnetometer data was provided by Imperial College London and supported by the UK Space Agency</Acknowledgement>
          <Contact>
-           <PersonID>spase://CNES/Person/Tim.Horbury</PersonID>
+           <PersonID>spase://CNES/Person/CDPP-AMDA/Tim.Horbury</PersonID>
            <Role>PrincipalInvestigator</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Solar_Orbiter/MAG/so-mag-rtnhr.xml b/NumericalData/CDPP-AMDA/Solar_Orbiter/MAG/so-mag-rtnhr.xml
index 5e8eaa8..ff3383f 100644
--- a/NumericalData/CDPP-AMDA/Solar_Orbiter/MAG/so-mag-rtnhr.xml
+++ b/NumericalData/CDPP-AMDA/Solar_Orbiter/MAG/so-mag-rtnhr.xml
@@ -10,7 +10,7 @@
           <Description>Publication quality. Take note of Quality Flag and refer to SOL-MAG-DPDD for exceptions ( see SolO Archive Support Data)</Description>
           <Acknowledgement>Solar Orbiter magnetometer data was provided by Imperial College London and supported by the UK Space Agency</Acknowledgement>
          <Contact>
-           <PersonID>spase://CNES/Person/Tim.Horbury</PersonID>
+           <PersonID>spase://CNES/Person/CDPP-AMDA/Tim.Horbury</PersonID>
            <Role>PrincipalInvestigator</Role>
          </Contact>
           <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Solar_Orbiter/MAG/solo-mag-8s.xml b/NumericalData/CDPP-AMDA/Solar_Orbiter/MAG/solo-mag-8s.xml
index 3ab3835..c230d86 100644
--- a/NumericalData/CDPP-AMDA/Solar_Orbiter/MAG/solo-mag-8s.xml
+++ b/NumericalData/CDPP-AMDA/Solar_Orbiter/MAG/solo-mag-8s.xml
@@ -22,7 +22,7 @@
           </Description>
          <Acknowledgement />
          <Contact>
-           <PersonID>spase://CNES/Person/Tim.Horbury</PersonID>
+           <PersonID>spase://CNES/Person/CDPP-AMDA/Tim.Horbury</PersonID>
            <Role>PrincipalInvestigator</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Solar_Orbiter/MAG/solo-mag-hr.cdag.xml b/NumericalData/CDPP-AMDA/Solar_Orbiter/MAG/solo-mag-hr.cdag.xml
index 401a3a4..24fc178 100644
--- a/NumericalData/CDPP-AMDA/Solar_Orbiter/MAG/solo-mag-hr.cdag.xml
+++ b/NumericalData/CDPP-AMDA/Solar_Orbiter/MAG/solo-mag-hr.cdag.xml
@@ -10,7 +10,7 @@
           <Description>Publication quality. Take note of Quality Flag and refer to SOL-MAG-DPDD for exceptions ( see SolO Archive Support Data)</Description>
           <Acknowledgement>Solar Orbiter magnetometer data was provided by Imperial College London and supported by the UK Space Agency</Acknowledgement>
          <Contact>
-           <PersonID>spase://CNES/Person/Tim.Horbury</PersonID>
+           <PersonID>spase://CNES/Person/CDPP-AMDA/Tim.Horbury</PersonID>
            <Role>PrincipalInvestigator</Role>
          </Contact>
           <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Solar_Orbiter/MAG/solo-mag-hr.xml b/NumericalData/CDPP-AMDA/Solar_Orbiter/MAG/solo-mag-hr.xml
index 7ce16bf..42272f1 100644
--- a/NumericalData/CDPP-AMDA/Solar_Orbiter/MAG/solo-mag-hr.xml
+++ b/NumericalData/CDPP-AMDA/Solar_Orbiter/MAG/solo-mag-hr.xml
@@ -10,7 +10,7 @@
           <Description>Publication quality. Take note of Quality Flag and refer to SOL-MAG-DPDD for exceptions ( see SolO Archive Support Data)</Description>
           <Acknowledgement>Solar Orbiter magnetometer data was provided by Imperial College London and supported by the UK Space Agency</Acknowledgement>
          <Contact>
-           <PersonID>spase://CNES/Person/Tim.Horbury</PersonID>
+           <PersonID>spase://CNES/Person/CDPP-AMDA/Tim.Horbury</PersonID>
            <Role>PrincipalInvestigator</Role>
          </Contact>
           <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Solar_Orbiter/PAS/so-pas-3d.xml b/NumericalData/CDPP-AMDA/Solar_Orbiter/PAS/so-pas-3d.xml
index 71ae957..f2fe0d1 100644
--- a/NumericalData/CDPP-AMDA/Solar_Orbiter/PAS/so-pas-3d.xml
+++ b/NumericalData/CDPP-AMDA/Solar_Orbiter/PAS/so-pas-3d.xml
@@ -14,7 +14,7 @@
                 <Role>PrincipalInvestigator</Role>
             </Contact>           
             <Contact>
-                <PersonID>spase://CNES/Person/Andrei.Fedorov</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Andrei.Fedorov</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Solar_Orbiter/PAS/so-pas-hk.xml b/NumericalData/CDPP-AMDA/Solar_Orbiter/PAS/so-pas-hk.xml
index c7c8059..5de5d90 100644
--- a/NumericalData/CDPP-AMDA/Solar_Orbiter/PAS/so-pas-hk.xml
+++ b/NumericalData/CDPP-AMDA/Solar_Orbiter/PAS/so-pas-hk.xml
@@ -14,7 +14,7 @@
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/Andrei.Fedorov</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Andrei.Fedorov</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Solar_Orbiter/PAS/so-pas-l2.3d.xml b/NumericalData/CDPP-AMDA/Solar_Orbiter/PAS/so-pas-l2.3d.xml
index 098a59e..9725e7d 100644
--- a/NumericalData/CDPP-AMDA/Solar_Orbiter/PAS/so-pas-l2.3d.xml
+++ b/NumericalData/CDPP-AMDA/Solar_Orbiter/PAS/so-pas-l2.3d.xml
@@ -14,7 +14,7 @@
                 <Role>PrincipalInvestigator</Role>
             </Contact>           
             <Contact>
-                <PersonID>spase://CNES/Person/Andrei.Fedorov</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Andrei.Fedorov</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Solar_Orbiter/PAS/so-pas-l2.omni.xml b/NumericalData/CDPP-AMDA/Solar_Orbiter/PAS/so-pas-l2.omni.xml
index a86de5c..4e98cd6 100644
--- a/NumericalData/CDPP-AMDA/Solar_Orbiter/PAS/so-pas-l2.omni.xml
+++ b/NumericalData/CDPP-AMDA/Solar_Orbiter/PAS/so-pas-l2.omni.xml
@@ -14,7 +14,7 @@
                 <Role>PrincipalInvestigator</Role>
             </Contact>           
             <Contact>
-                <PersonID>spase://CNES/Person/Andrei.Fedorov</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Andrei.Fedorov</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Solar_Orbiter/PAS/so-pas-mom.xml b/NumericalData/CDPP-AMDA/Solar_Orbiter/PAS/so-pas-mom.xml
index 0be3c8a..e0a08c1 100644
--- a/NumericalData/CDPP-AMDA/Solar_Orbiter/PAS/so-pas-mom.xml
+++ b/NumericalData/CDPP-AMDA/Solar_Orbiter/PAS/so-pas-mom.xml
@@ -14,7 +14,7 @@
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/Andrei.Fedorov</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Andrei.Fedorov</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Solar_Orbiter/PAS/so-pas-momgr1.xml b/NumericalData/CDPP-AMDA/Solar_Orbiter/PAS/so-pas-momgr1.xml
index bbe6277..4ca1c7a 100644
--- a/NumericalData/CDPP-AMDA/Solar_Orbiter/PAS/so-pas-momgr1.xml
+++ b/NumericalData/CDPP-AMDA/Solar_Orbiter/PAS/so-pas-momgr1.xml
@@ -14,7 +14,7 @@
                 <Role>PrincipalInvestigator</Role>
             </Contact>           
             <Contact>
-                <PersonID>spase://CNES/Person/Andrei.Fedorov</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Andrei.Fedorov</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Solar_Orbiter/PAS/so-pas-momtest.xml b/NumericalData/CDPP-AMDA/Solar_Orbiter/PAS/so-pas-momtest.xml
index de6c61c..8a53891 100644
--- a/NumericalData/CDPP-AMDA/Solar_Orbiter/PAS/so-pas-momtest.xml
+++ b/NumericalData/CDPP-AMDA/Solar_Orbiter/PAS/so-pas-momtest.xml
@@ -14,7 +14,7 @@
                 <Role>PrincipalInvestigator</Role>
             </Contact>           
             <Contact>
-                <PersonID>spase://CNES/Person/Andrei.Fedorov</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Andrei.Fedorov</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/THEMIS/A/Models/tha-msph-models.xml b/NumericalData/CDPP-AMDA/THEMIS/A/Models/tha-msph-models.xml
index bb91717..e19aed8 100644
--- a/NumericalData/CDPP-AMDA/THEMIS/A/Models/tha-msph-models.xml
+++ b/NumericalData/CDPP-AMDA/THEMIS/A/Models/tha-msph-models.xml
@@ -12,7 +12,7 @@
          </Description>
          <Acknowledgement>TBD</Acknowledgement> 
          <Contact>
-            <PersonID>spase://CNES/Person/Christian.Jacquey</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Christian.Jacquey</PersonID>
             <Role>TechnicalContact</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/THEMIS/A/Models/tha-t96-model.xml b/NumericalData/CDPP-AMDA/THEMIS/A/Models/tha-t96-model.xml
index 820ba08..1310304 100644
--- a/NumericalData/CDPP-AMDA/THEMIS/A/Models/tha-t96-model.xml
+++ b/NumericalData/CDPP-AMDA/THEMIS/A/Models/tha-t96-model.xml
@@ -15,7 +15,7 @@
          </Description>
          <Acknowledgement>TBD</Acknowledgement> 
          <Contact>
-         <PersonID>spase://CNES/Person/Nikolai.Tsyganenko</PersonID>
+         <PersonID>spase://CNES/Person/CDPP-AMDA/Nikolai.Tsyganenko</PersonID>
             <Role>PrincipalInvestigator</Role>
          </Contact>            
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/THEMIS/B/Models/thb-msph-models.xml b/NumericalData/CDPP-AMDA/THEMIS/B/Models/thb-msph-models.xml
index 5a98da4..cb4f6ca 100644
--- a/NumericalData/CDPP-AMDA/THEMIS/B/Models/thb-msph-models.xml
+++ b/NumericalData/CDPP-AMDA/THEMIS/B/Models/thb-msph-models.xml
@@ -12,7 +12,7 @@
          </Description>
          <Acknowledgement>TBD</Acknowledgement> 
          <Contact>
-            <PersonID>spase://CNES/Person/Christian.Jacquey</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Christian.Jacquey</PersonID>
             <Role>TechnicalContact</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/THEMIS/B/Models/thb-t96-model.xml b/NumericalData/CDPP-AMDA/THEMIS/B/Models/thb-t96-model.xml
index 3a3324b..79842ad 100644
--- a/NumericalData/CDPP-AMDA/THEMIS/B/Models/thb-t96-model.xml
+++ b/NumericalData/CDPP-AMDA/THEMIS/B/Models/thb-t96-model.xml
@@ -15,7 +15,7 @@
          </Description>
          <Acknowledgement>TBD</Acknowledgement> 
          <Contact>
-         <PersonID>spase://CNES/Person/Nikolai.Tsyganenko</PersonID>
+         <PersonID>spase://CNES/Person/CDPP-AMDA/Nikolai.Tsyganenko</PersonID>
             <Role>PrincipalInvestigator</Role>
          </Contact>            
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/THEMIS/C/Models/thc-msph-models.xml b/NumericalData/CDPP-AMDA/THEMIS/C/Models/thc-msph-models.xml
index fc5717a..4e89f55 100644
--- a/NumericalData/CDPP-AMDA/THEMIS/C/Models/thc-msph-models.xml
+++ b/NumericalData/CDPP-AMDA/THEMIS/C/Models/thc-msph-models.xml
@@ -12,7 +12,7 @@
          </Description>
          <Acknowledgement>TBD</Acknowledgement> 
          <Contact>
-            <PersonID>spase://CNES/Person/Christian.Jacquey</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Christian.Jacquey</PersonID>
             <Role>TechnicalContact</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/THEMIS/C/Models/thc-t96-model.xml b/NumericalData/CDPP-AMDA/THEMIS/C/Models/thc-t96-model.xml
index f65b031..f7d22da 100644
--- a/NumericalData/CDPP-AMDA/THEMIS/C/Models/thc-t96-model.xml
+++ b/NumericalData/CDPP-AMDA/THEMIS/C/Models/thc-t96-model.xml
@@ -15,7 +15,7 @@
          </Description>
          <Acknowledgement>TBD</Acknowledgement> 
          <Contact>
-         <PersonID>spase://CNES/Person/Nikolai.Tsyganenko</PersonID>
+         <PersonID>spase://CNES/Person/CDPP-AMDA/Nikolai.Tsyganenko</PersonID>
             <Role>PrincipalInvestigator</Role>
          </Contact>            
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/THEMIS/D/Models/thd-msph-models.xml b/NumericalData/CDPP-AMDA/THEMIS/D/Models/thd-msph-models.xml
index 587a42b..5b5693a 100644
--- a/NumericalData/CDPP-AMDA/THEMIS/D/Models/thd-msph-models.xml
+++ b/NumericalData/CDPP-AMDA/THEMIS/D/Models/thd-msph-models.xml
@@ -12,7 +12,7 @@
          </Description>
          <Acknowledgement>TBD</Acknowledgement> 
          <Contact>
-            <PersonID>spase://CNES/Person/Christian.Jacquey</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Christian.Jacquey</PersonID>
             <Role>TechnicalContact</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/THEMIS/D/Models/thd-t96-model.xml b/NumericalData/CDPP-AMDA/THEMIS/D/Models/thd-t96-model.xml
index 5a79540..fcca39a 100644
--- a/NumericalData/CDPP-AMDA/THEMIS/D/Models/thd-t96-model.xml
+++ b/NumericalData/CDPP-AMDA/THEMIS/D/Models/thd-t96-model.xml
@@ -15,7 +15,7 @@
          </Description>
          <Acknowledgement>TBD</Acknowledgement> 
          <Contact>
-         <PersonID>spase://CNES/Person/Nikolai.Tsyganenko</PersonID>
+         <PersonID>spase://CNES/Person/CDPP-AMDA/Nikolai.Tsyganenko</PersonID>
             <Role>PrincipalInvestigator</Role>
          </Contact>            
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/THEMIS/E/Models/the-msph-models.xml b/NumericalData/CDPP-AMDA/THEMIS/E/Models/the-msph-models.xml
index 1799849..67081f3 100644
--- a/NumericalData/CDPP-AMDA/THEMIS/E/Models/the-msph-models.xml
+++ b/NumericalData/CDPP-AMDA/THEMIS/E/Models/the-msph-models.xml
@@ -12,7 +12,7 @@
          </Description>
          <Acknowledgement>TBD</Acknowledgement> 
          <Contact>
-            <PersonID>spase://CNES/Person/Christian.Jacquey</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Christian.Jacquey</PersonID>
             <Role>TechnicalContact</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/THEMIS/E/Models/the-t96-model.xml b/NumericalData/CDPP-AMDA/THEMIS/E/Models/the-t96-model.xml
index eb33eec..891afbf 100644
--- a/NumericalData/CDPP-AMDA/THEMIS/E/Models/the-t96-model.xml
+++ b/NumericalData/CDPP-AMDA/THEMIS/E/Models/the-t96-model.xml
@@ -15,7 +15,7 @@
          </Description>
          <Acknowledgement>TBD</Acknowledgement> 
          <Contact>
-         <PersonID>spase://CNES/Person/Nikolai.Tsyganenko</PersonID>
+         <PersonID>spase://CNES/Person/CDPP-AMDA/Nikolai.Tsyganenko</PersonID>
             <Role>PrincipalInvestigator</Role>
          </Contact>            
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/TIMED/SEE/timed-see-l3.xml b/NumericalData/CDPP-AMDA/TIMED/SEE/timed-see-l3.xml
index ad54866..27b8cf8 100644
--- a/NumericalData/CDPP-AMDA/TIMED/SEE/timed-see-l3.xml
+++ b/NumericalData/CDPP-AMDA/TIMED/SEE/timed-see-l3.xml
@@ -23,7 +23,7 @@ declined. Appropriate acknowledgement to institutions,
 personnel, and funding agencies should be given.  
          </Acknowledgement>
         <Contact>     
-        <PersonID>spase://CNES/Person/T.Woods</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/T.Woods</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>      
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/TIMED/SEE/timed-see-l3a.xml b/NumericalData/CDPP-AMDA/TIMED/SEE/timed-see-l3a.xml
index a2be2ba..2880fde 100644
--- a/NumericalData/CDPP-AMDA/TIMED/SEE/timed-see-l3a.xml
+++ b/NumericalData/CDPP-AMDA/TIMED/SEE/timed-see-l3a.xml
@@ -25,7 +25,7 @@ declined. Appropriate acknowledgement to institutions,
 personnel, and funding agencies should be given.  
          </Acknowledgement>
         <Contact>     
-        <PersonID>spase://CNES/Person/T.Woods</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/T.Woods</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>      
          <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/VEX/ELS/vex-els-all.xml b/NumericalData/CDPP-AMDA/VEX/ELS/vex-els-all.xml
index 207a799..14765dc 100644
--- a/NumericalData/CDPP-AMDA/VEX/ELS/vex-els-all.xml
+++ b/NumericalData/CDPP-AMDA/VEX/ELS/vex-els-all.xml
@@ -14,7 +14,7 @@
                 <Role>PrincipalInvestigator</Role>
             </Contact>
              <Contact>
-                 <PersonID>spase://CNES/Person/Andrew.J.Coates</PersonID>
+                 <PersonID>spase://CNES/Person/CDPP-AMDA/Andrew.J.Coates</PersonID>
                  <Role>GeneralContact</Role>
              </Contact> 
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/VEX/IMA/vex-ima-bg.xml b/NumericalData/CDPP-AMDA/VEX/IMA/vex-ima-bg.xml
index a7d4862..f109c84 100644
--- a/NumericalData/CDPP-AMDA/VEX/IMA/vex-ima-bg.xml
+++ b/NumericalData/CDPP-AMDA/VEX/IMA/vex-ima-bg.xml
@@ -8,7 +8,7 @@
             <ReleaseDate>2020-08-15T09:42:00</ReleaseDate>
             <Description></Description>
             <Contact>
-                <PersonID>spase://CNES/Person/Yoshifumi.Futaana</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Yoshifumi.Futaana</PersonID>
                 <Role>GeneralContact</Role>
             </Contact>
         </ResourceHeader>
diff --git a/NumericalData/CDPP-AMDA/VEX/IMA/vex-ima-extra.xml b/NumericalData/CDPP-AMDA/VEX/IMA/vex-ima-extra.xml
index feb060d..b8d5b19 100644
--- a/NumericalData/CDPP-AMDA/VEX/IMA/vex-ima-extra.xml
+++ b/NumericalData/CDPP-AMDA/VEX/IMA/vex-ima-extra.xml
@@ -9,11 +9,11 @@
             <Description>Venus Express (VEX) ASPERA-4 Ion Mass Analyzer (IMA) data (spectrogram)
                 Preliminary spectra obtained from Andrei Fedorov (IRAP)</Description>
              <Contact>
-                <PersonID>spase://CNES/Person/Andrei.Fedorov</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Andrei.Fedorov</PersonID>
                 <Role>GeneralContact</Role>
             </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/Elena.Budnik</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Elena.Budnik</PersonID>
                 <Role>GeneralContact</Role>
             </Contact>
         </ResourceHeader>
diff --git a/NumericalData/CDPP-AMDA/VEX/IMA/vex-ima-sw.xml b/NumericalData/CDPP-AMDA/VEX/IMA/vex-ima-sw.xml
index 2fdd80d..2e5ae6e 100644
--- a/NumericalData/CDPP-AMDA/VEX/IMA/vex-ima-sw.xml
+++ b/NumericalData/CDPP-AMDA/VEX/IMA/vex-ima-sw.xml
@@ -9,11 +9,11 @@
             <ReleaseDate>2017-02-15T09:42:00</ReleaseDate>
             <Description>Vex IMA protons density and velocity in SW is a subset of IMA ion moments dataset on applying an orbital restrictions. IMA ion moments are calculated in IRAP using Andrei Fedorov procedure.</Description>
             <Contact>
-                <PersonID>spase://CNES/Person/Andrei.Fedorov</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Andrei.Fedorov</PersonID>
                 <Role>GeneralContact</Role>
             </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/Elena.Budnik</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Elena.Budnik</PersonID>
                 <Role>TechnicalContact</Role>
             </Contact>
         </ResourceHeader>
diff --git a/NumericalData/CDPP-AMDA/VEX/MAG/vex-mag-all.xml b/NumericalData/CDPP-AMDA/VEX/MAG/vex-mag-all.xml
index 8184643..5904cb0 100644
--- a/NumericalData/CDPP-AMDA/VEX/MAG/vex-mag-all.xml
+++ b/NumericalData/CDPP-AMDA/VEX/MAG/vex-mag-all.xml
@@ -9,7 +9,7 @@
             <ReleaseDate>2016-10-13T11:09:00Z</ReleaseDate>
             <Description>resampled calibrated data</Description>
             <Contact>
-                <PersonID>spase://CNES/Person/Magda.Delva</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Magda.Delva</PersonID>
                 <Role>GeneralContact</Role>
             </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/VEX/MAG/vex-mag-hz.xml b/NumericalData/CDPP-AMDA/VEX/MAG/vex-mag-hz.xml
index 2a5e9e7..59d40cf 100644
--- a/NumericalData/CDPP-AMDA/VEX/MAG/vex-mag-hz.xml
+++ b/NumericalData/CDPP-AMDA/VEX/MAG/vex-mag-hz.xml
@@ -9,7 +9,7 @@
             <ReleaseDate>2015-10-13T10:46:00Z</ReleaseDate>
             <Description>calibrated_data, 1 Hz data-resolution</Description>
             <Contact>
-                <PersonID>spase://CNES/Person/Magda.Delva</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Magda.Delva</PersonID>
                 <Role>GeneralContact</Role>
             </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Voyager1/CRS/vo1-crs-full.xml b/NumericalData/CDPP-AMDA/Voyager1/CRS/vo1-crs-full.xml
index 8e57461..d4ef729 100644
--- a/NumericalData/CDPP-AMDA/Voyager1/CRS/vo1-crs-full.xml
+++ b/NumericalData/CDPP-AMDA/Voyager1/CRS/vo1-crs-full.xml
@@ -8,7 +8,7 @@
             <ReleaseDate>2011-08-29T07:45:17Z</ReleaseDate>
             <Description/>
              <Contact>
-                <PersonID>spase://CNES/Person/N.Papitashvili</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/N.Papitashvili</PersonID>
                 <Role>DataProducer</Role>
             </Contact>
         </ResourceHeader>
diff --git a/NumericalData/CDPP-AMDA/Voyager1/Ephemeris/vo1-ephem-all.xml b/NumericalData/CDPP-AMDA/Voyager1/Ephemeris/vo1-ephem-all.xml
index 8ba79dc..930ff41 100644
--- a/NumericalData/CDPP-AMDA/Voyager1/Ephemeris/vo1-ephem-all.xml
+++ b/NumericalData/CDPP-AMDA/Voyager1/Ephemeris/vo1-ephem-all.xml
@@ -9,7 +9,7 @@
             <ReleaseDate>2019-01-28T16:39:47Z</ReleaseDate>
             <Description>Calculated from SPICE kernels at IRAP</Description>
             <Contact>
-                <PersonID>spase://CNES/Person/Elena.Budnik</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Elena.Budnik</PersonID>
                 <Role>TechnicalContact</Role>
             </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Voyager1/LECP/vo1-lecp-full.xml b/NumericalData/CDPP-AMDA/Voyager1/LECP/vo1-lecp-full.xml
index 01287d4..ea1b97e 100644
--- a/NumericalData/CDPP-AMDA/Voyager1/LECP/vo1-lecp-full.xml
+++ b/NumericalData/CDPP-AMDA/Voyager1/LECP/vo1-lecp-full.xml
@@ -8,7 +8,7 @@
             <ReleaseDate>2011-08-29T07:45:17Z</ReleaseDate>
             <Description/>
              <Contact>
-                <PersonID>spase://CNES/Person/N.Papitashvili</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/N.Papitashvili</PersonID>
                 <Role>DataProducer</Role>
             </Contact>
         </ResourceHeader>
diff --git a/NumericalData/CDPP-AMDA/Voyager1/PLS/vo1-pls-full.xml b/NumericalData/CDPP-AMDA/Voyager1/PLS/vo1-pls-full.xml
index 15046fa..e9fca17 100644
--- a/NumericalData/CDPP-AMDA/Voyager1/PLS/vo1-pls-full.xml
+++ b/NumericalData/CDPP-AMDA/Voyager1/PLS/vo1-pls-full.xml
@@ -8,7 +8,7 @@
             <ReleaseDate>2011-08-29T07:45:17Z</ReleaseDate>
             <Description/>
              <Contact>
-                <PersonID>spase://CNES/Person/N.Papitashvili</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/N.Papitashvili</PersonID>
                 <Role>DataProducer</Role>
             </Contact>
         </ResourceHeader>
diff --git a/NumericalData/CDPP-AMDA/Voyager2/CRS/vo2-crs-full.xml b/NumericalData/CDPP-AMDA/Voyager2/CRS/vo2-crs-full.xml
index c0c4ee4..d7c98a3 100644
--- a/NumericalData/CDPP-AMDA/Voyager2/CRS/vo2-crs-full.xml
+++ b/NumericalData/CDPP-AMDA/Voyager2/CRS/vo2-crs-full.xml
@@ -8,7 +8,7 @@
             <ReleaseDate>2011-08-29T07:45:17Z</ReleaseDate>
             <Description/>
              <Contact>
-                <PersonID>spase://CNES/Person/N.Papitashvili</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/N.Papitashvili</PersonID>
                 <Role>DataProducer</Role>
             </Contact>
         </ResourceHeader>
diff --git a/NumericalData/CDPP-AMDA/Voyager2/Ephemeris/vo2-ephem-all.xml b/NumericalData/CDPP-AMDA/Voyager2/Ephemeris/vo2-ephem-all.xml
index 8761b14..1696280 100644
--- a/NumericalData/CDPP-AMDA/Voyager2/Ephemeris/vo2-ephem-all.xml
+++ b/NumericalData/CDPP-AMDA/Voyager2/Ephemeris/vo2-ephem-all.xml
@@ -9,7 +9,7 @@
             <ReleaseDate>2019-01-28T16:41:55Z</ReleaseDate>
             <Description>Calculated from SPICE kernels at IRAP</Description>
             <Contact>
-                <PersonID>spase://CNES/Person/Elena.Budnik</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Elena.Budnik</PersonID>
                 <Role>TechnicalContact</Role>
             </Contact>
             <InformationURL>
diff --git a/NumericalData/CDPP-AMDA/Voyager2/LECP/vo2-lecp-full.xml b/NumericalData/CDPP-AMDA/Voyager2/LECP/vo2-lecp-full.xml
index 562fde2..c2bf5ed 100644
--- a/NumericalData/CDPP-AMDA/Voyager2/LECP/vo2-lecp-full.xml
+++ b/NumericalData/CDPP-AMDA/Voyager2/LECP/vo2-lecp-full.xml
@@ -8,7 +8,7 @@
             <ReleaseDate>2011-08-29T07:45:17Z</ReleaseDate>
             <Description/>
              <Contact>
-                <PersonID>spase://CNES/Person/N.Papitashvili</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/N.Papitashvili</PersonID>
                 <Role>DataProducer</Role>
             </Contact>
         </ResourceHeader>
diff --git a/NumericalData/CDPP-AMDA/Voyager2/PLS/vo2-pls-full.xml b/NumericalData/CDPP-AMDA/Voyager2/PLS/vo2-pls-full.xml
index 11dadcd..0ce1d38 100644
--- a/NumericalData/CDPP-AMDA/Voyager2/PLS/vo2-pls-full.xml
+++ b/NumericalData/CDPP-AMDA/Voyager2/PLS/vo2-pls-full.xml
@@ -8,7 +8,7 @@
             <ReleaseDate>2011-08-29T07:45:17Z</ReleaseDate>
             <Description/>
              <Contact>
-                <PersonID>spase://CNES/Person/N.Papitashvili</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/N.Papitashvili</PersonID>
                 <Role>DataProducer</Role>
             </Contact>
         </ResourceHeader>
diff --git a/NumericalOutput/CDPP-AMDA/BALLISTIC/bls-bepi-dsc.xml b/NumericalOutput/CDPP-AMDA/BALLISTIC/bls-bepi-dsc.xml
index 9b061e0..4f079cd 100644
--- a/NumericalOutput/CDPP-AMDA/BALLISTIC/bls-bepi-dsc.xml
+++ b/NumericalOutput/CDPP-AMDA/BALLISTIC/bls-bepi-dsc.xml
@@ -15,7 +15,7 @@
          </Description>
          <Acknowledgement/>
          <Contact>
-            <PersonID>spase://CNES/Person/Vincent.Genot</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Vincent.Genot</PersonID>
             <Role>PrincipalInvestigator</Role>
          </Contact>
          <InformationURL>           
diff --git a/NumericalOutput/CDPP-AMDA/BALLISTIC/bls-bepi-omni.xml b/NumericalOutput/CDPP-AMDA/BALLISTIC/bls-bepi-omni.xml
index 1be25ad..04135fc 100644
--- a/NumericalOutput/CDPP-AMDA/BALLISTIC/bls-bepi-omni.xml
+++ b/NumericalOutput/CDPP-AMDA/BALLISTIC/bls-bepi-omni.xml
@@ -15,7 +15,7 @@
          </Description>
          <Acknowledgement/>
          <Contact>
-            <PersonID>spase://CNES/Person/Vincent.Genot</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Vincent.Genot</PersonID>
             <Role>PrincipalInvestigator</Role>
          </Contact>
          <InformationURL>           
diff --git a/NumericalOutput/CDPP-AMDA/BALLISTIC/bls-jupiter-omni.xml b/NumericalOutput/CDPP-AMDA/BALLISTIC/bls-jupiter-omni.xml
index 2ca017b..c1e0cb9 100644
--- a/NumericalOutput/CDPP-AMDA/BALLISTIC/bls-jupiter-omni.xml
+++ b/NumericalOutput/CDPP-AMDA/BALLISTIC/bls-jupiter-omni.xml
@@ -17,7 +17,7 @@
          </Description>
          <Acknowledgement/>
          <Contact>
-            <PersonID>spase://CNES/Person/Vincent.Genot</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Vincent.Genot</PersonID>
             <Role>PrincipalInvestigator</Role>
          </Contact>
          <InformationURL>           
diff --git a/NumericalOutput/CDPP-AMDA/BALLISTIC/bls-mars-omni.xml b/NumericalOutput/CDPP-AMDA/BALLISTIC/bls-mars-omni.xml
index 10cefbd..b522aba 100644
--- a/NumericalOutput/CDPP-AMDA/BALLISTIC/bls-mars-omni.xml
+++ b/NumericalOutput/CDPP-AMDA/BALLISTIC/bls-mars-omni.xml
@@ -18,7 +18,7 @@
          </Description>
          <Acknowledgement/>
          <Contact>
-            <PersonID>spase://CNES/Person/Vincent.Genot</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Vincent.Genot</PersonID>
             <Role>PrincipalInvestigator</Role>
          </Contact>
          <InformationURL>           
diff --git a/NumericalOutput/CDPP-AMDA/BALLISTIC/bls-mercury-omni.xml b/NumericalOutput/CDPP-AMDA/BALLISTIC/bls-mercury-omni.xml
index 39c2e50..0925f11 100644
--- a/NumericalOutput/CDPP-AMDA/BALLISTIC/bls-mercury-omni.xml
+++ b/NumericalOutput/CDPP-AMDA/BALLISTIC/bls-mercury-omni.xml
@@ -15,7 +15,7 @@
          </Description>
          <Acknowledgement/>
          <Contact>
-            <PersonID>spase://CNES/Person/Vincent.Genot</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Vincent.Genot</PersonID>
             <Role>PrincipalInvestigator</Role>
          </Contact>
          <InformationURL>           
diff --git a/NumericalOutput/CDPP-AMDA/BALLISTIC/bls-neptune-omni.xml b/NumericalOutput/CDPP-AMDA/BALLISTIC/bls-neptune-omni.xml
index 0ff9ba2..330aa09 100644
--- a/NumericalOutput/CDPP-AMDA/BALLISTIC/bls-neptune-omni.xml
+++ b/NumericalOutput/CDPP-AMDA/BALLISTIC/bls-neptune-omni.xml
@@ -15,7 +15,7 @@
          </Description>
          <Acknowledgement/>
          <Contact>
-            <PersonID>spase://CNES/Person/Vincent.Genot</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Vincent.Genot</PersonID>
             <Role>PrincipalInvestigator</Role>
          </Contact>
          <InformationURL>           
diff --git a/NumericalOutput/CDPP-AMDA/BALLISTIC/bls-psp-dsc.xml b/NumericalOutput/CDPP-AMDA/BALLISTIC/bls-psp-dsc.xml
index 387717a..5a66e75 100644
--- a/NumericalOutput/CDPP-AMDA/BALLISTIC/bls-psp-dsc.xml
+++ b/NumericalOutput/CDPP-AMDA/BALLISTIC/bls-psp-dsc.xml
@@ -15,7 +15,7 @@
          </Description>
          <Acknowledgement/>
          <Contact>
-            <PersonID>spase://CNES/Person/Vincent.Genot</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Vincent.Genot</PersonID>
             <Role>PrincipalInvestigator</Role>
          </Contact>
          <InformationURL>           
diff --git a/NumericalOutput/CDPP-AMDA/BALLISTIC/bls-psp-omni.xml b/NumericalOutput/CDPP-AMDA/BALLISTIC/bls-psp-omni.xml
index 7a527a8..c8d1164 100644
--- a/NumericalOutput/CDPP-AMDA/BALLISTIC/bls-psp-omni.xml
+++ b/NumericalOutput/CDPP-AMDA/BALLISTIC/bls-psp-omni.xml
@@ -15,7 +15,7 @@
          </Description>
          <Acknowledgement/>
          <Contact>
-            <PersonID>spase://CNES/Person/Vincent.Genot</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Vincent.Genot</PersonID>
             <Role>PrincipalInvestigator</Role>
          </Contact>
          <InformationURL>           
diff --git a/NumericalOutput/CDPP-AMDA/BALLISTIC/bls-ros-omni.xml b/NumericalOutput/CDPP-AMDA/BALLISTIC/bls-ros-omni.xml
index 6582573..eca08af 100644
--- a/NumericalOutput/CDPP-AMDA/BALLISTIC/bls-ros-omni.xml
+++ b/NumericalOutput/CDPP-AMDA/BALLISTIC/bls-ros-omni.xml
@@ -15,7 +15,7 @@
          </Description>
          <Acknowledgement/>
          <Contact>
-            <PersonID>spase://CNES/Person/Vincent.Genot</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Vincent.Genot</PersonID>
             <Role>PrincipalInvestigator</Role>
          </Contact>
          <InformationURL>           
diff --git a/NumericalOutput/CDPP-AMDA/BALLISTIC/bls-saturn-omni.xml b/NumericalOutput/CDPP-AMDA/BALLISTIC/bls-saturn-omni.xml
index c55d331..6121541 100644
--- a/NumericalOutput/CDPP-AMDA/BALLISTIC/bls-saturn-omni.xml
+++ b/NumericalOutput/CDPP-AMDA/BALLISTIC/bls-saturn-omni.xml
@@ -17,7 +17,7 @@
          </Description>
          <Acknowledgement/>
          <Contact>
-            <PersonID>spase://CNES/Person/Vincent.Genot</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Vincent.Genot</PersonID>
             <Role>PrincipalInvestigator</Role>
          </Contact>
          <InformationURL/>                      
diff --git a/NumericalOutput/CDPP-AMDA/BALLISTIC/bls-solo-dsc.xml b/NumericalOutput/CDPP-AMDA/BALLISTIC/bls-solo-dsc.xml
index 352239e..516189e 100644
--- a/NumericalOutput/CDPP-AMDA/BALLISTIC/bls-solo-dsc.xml
+++ b/NumericalOutput/CDPP-AMDA/BALLISTIC/bls-solo-dsc.xml
@@ -18,7 +18,7 @@
          </Description>
          <Acknowledgement/>
          <Contact>
-            <PersonID>spase://CNES/Person/Vincent.Genot</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Vincent.Genot</PersonID>
             <Role>PrincipalInvestigator</Role>
          </Contact>
          <InformationURL>           
diff --git a/NumericalOutput/CDPP-AMDA/BALLISTIC/bls-uranus-omni.xml b/NumericalOutput/CDPP-AMDA/BALLISTIC/bls-uranus-omni.xml
index a7d510d..3f90ca0 100644
--- a/NumericalOutput/CDPP-AMDA/BALLISTIC/bls-uranus-omni.xml
+++ b/NumericalOutput/CDPP-AMDA/BALLISTIC/bls-uranus-omni.xml
@@ -15,7 +15,7 @@
          </Description>
          <Acknowledgement/>
          <Contact>
-            <PersonID>spase://CNES/Person/Vincent.Genot</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Vincent.Genot</PersonID>
             <Role>PrincipalInvestigator</Role>
          </Contact>
          <InformationURL>           
diff --git a/NumericalOutput/CDPP-AMDA/BALLISTIC/bls-venus-omni.xml b/NumericalOutput/CDPP-AMDA/BALLISTIC/bls-venus-omni.xml
index 2d85f9b..70f58ae 100644
--- a/NumericalOutput/CDPP-AMDA/BALLISTIC/bls-venus-omni.xml
+++ b/NumericalOutput/CDPP-AMDA/BALLISTIC/bls-venus-omni.xml
@@ -17,7 +17,7 @@
          </Description>
          <Acknowledgement/>
          <Contact>
-            <PersonID>spase://CNES/Person/Vincent.Genot</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Vincent.Genot</PersonID>
             <Role>PrincipalInvestigator</Role>
          </Contact>
          <InformationURL>           
diff --git a/NumericalOutput/CDPP-AMDA/CAIN/b_cain.xml b/NumericalOutput/CDPP-AMDA/CAIN/b_cain.xml
index f90f44a..b432e9a 100644
--- a/NumericalOutput/CDPP-AMDA/CAIN/b_cain.xml
+++ b/NumericalOutput/CDPP-AMDA/CAIN/b_cain.xml
@@ -11,11 +11,11 @@
       </Description>
       <Acknowledgement/>
        <Contact>
-                <PersonID>spase://CNES/Person/Joseph.C.Cain</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Joseph.C.Cain</PersonID>
                 <Role>PrincipalInvestigator</Role>
               </Contact> 
       <Contact>     
-            <PersonID>spase://CNES/Person/Elena.Budnik</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Elena.Budnik</PersonID>
             <Role>TechnicalContact</Role>           
       </Contact>     
       <InformationURL>
diff --git a/NumericalOutput/CDPP-AMDA/JRM09/b_jrm09.xml b/NumericalOutput/CDPP-AMDA/JRM09/b_jrm09.xml
index 10593f0..1300a4a 100644
--- a/NumericalOutput/CDPP-AMDA/JRM09/b_jrm09.xml
+++ b/NumericalOutput/CDPP-AMDA/JRM09/b_jrm09.xml
@@ -14,11 +14,11 @@
       </Description>
       <Acknowledgement/>
          <Contact>
-            <PersonID>spase://CNES/Person/Connerney</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Connerney</PersonID>
             <Role>PrincipalInvestigator</Role>
          </Contact>  
       <Contact>
-            <PersonID>spase://CNES/Person/YWang</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/YWang</PersonID>
             <Role>TechnicalContact</Role>
          </Contact>          
       <InformationURL>
diff --git a/NumericalOutput/CDPP-AMDA/MORSCHHAUSER/b_morschhauser.xml b/NumericalOutput/CDPP-AMDA/MORSCHHAUSER/b_morschhauser.xml
index 9e24e15..4bf34e4 100644
--- a/NumericalOutput/CDPP-AMDA/MORSCHHAUSER/b_morschhauser.xml
+++ b/NumericalOutput/CDPP-AMDA/MORSCHHAUSER/b_morschhauser.xml
@@ -10,15 +10,15 @@
             S/c and sampling time should be defined by user.</Description>
       <Acknowledgement/>
        <Contact>
-                <PersonID>spase://CNES/Person/A.Morschhauser</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/A.Morschhauser</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/A.Beth</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/A.Beth</PersonID>
                 <Role>TechnicalContact</Role>
             </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/Elena.Budnik</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Elena.Budnik</PersonID>
                 <Role>TechnicalContact</Role>
             </Contact>
       <InformationURL>
diff --git a/NumericalOutput/CDPP-AMDA/TAO/Bepi/tao-bepi-dsc.xml b/NumericalOutput/CDPP-AMDA/TAO/Bepi/tao-bepi-dsc.xml
index ddebf5c..39f3938 100644
--- a/NumericalOutput/CDPP-AMDA/TAO/Bepi/tao-bepi-dsc.xml
+++ b/NumericalOutput/CDPP-AMDA/TAO/Bepi/tao-bepi-dsc.xml
@@ -10,11 +10,11 @@
 	 <Description>DSCOVR FC solar wind 1-min data is used as model input. Calculation : IRAP.</Description>
          <Acknowledgement>TBD</Acknowledgement>
          <Contact>
-            <PersonID>spase://CNES/Person/Chihiro.Tao</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Chihiro.Tao</PersonID>
             <Role>PrincipalInvestigator</Role>
          </Contact>
          <Contact>
-            <PersonID>spase://CNES/Person/Elena.Budnik</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Elena.Budnik</PersonID>
             <Role>TechnicalContact</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalOutput/CDPP-AMDA/TAO/Bepi/tao-bepi-sta.xml b/NumericalOutput/CDPP-AMDA/TAO/Bepi/tao-bepi-sta.xml
index a62df0b..e444f10 100644
--- a/NumericalOutput/CDPP-AMDA/TAO/Bepi/tao-bepi-sta.xml
+++ b/NumericalOutput/CDPP-AMDA/TAO/Bepi/tao-bepi-sta.xml
@@ -10,11 +10,11 @@
          <Description>Stereo-A PLASTIC solar wind 1-hour data is used as model input. Calculation : IRAP.</Description>
          <Acknowledgement>TBD</Acknowledgement>
          <Contact>
-            <PersonID>spase://CNES/Person/Chihiro.Tao</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Chihiro.Tao</PersonID>
             <Role>PrincipalInvestigator</Role>
          </Contact>
          <Contact>
-            <PersonID>spase://CNES/Person/Elena.Budnik</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Elena.Budnik</PersonID>
             <Role>TechnicalContact</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalOutput/CDPP-AMDA/TAO/Bepi/tao-bepi-sw.xml b/NumericalOutput/CDPP-AMDA/TAO/Bepi/tao-bepi-sw.xml
index 7bb7b13..1e10a69 100644
--- a/NumericalOutput/CDPP-AMDA/TAO/Bepi/tao-bepi-sw.xml
+++ b/NumericalOutput/CDPP-AMDA/TAO/Bepi/tao-bepi-sw.xml
@@ -10,11 +10,11 @@
          <Description>OMNI solar wind 1-hour data is used as model input. Calculation : IRAP.</Description>
          <Acknowledgement>TBD</Acknowledgement>
          <Contact>
-            <PersonID>spase://CNES/Person/Chihiro.Tao</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Chihiro.Tao</PersonID>
             <Role>PrincipalInvestigator</Role>
          </Contact>
          <Contact>
-            <PersonID>spase://CNES/Person/Elena.Budnik</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Elena.Budnik</PersonID>
             <Role>TechnicalContact</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalOutput/CDPP-AMDA/TAO/Bepi/tao-bepi-swrt.xml b/NumericalOutput/CDPP-AMDA/TAO/Bepi/tao-bepi-swrt.xml
index b0312cf..31e58dd 100644
--- a/NumericalOutput/CDPP-AMDA/TAO/Bepi/tao-bepi-swrt.xml
+++ b/NumericalOutput/CDPP-AMDA/TAO/Bepi/tao-bepi-swrt.xml
@@ -10,11 +10,11 @@
          <Description>ACE Real Time solar wind 1-min data from NOAA (ftp.swpc.noaa.gov) is used as model input. Calculation : IRAP.</Description>
          <Acknowledgement>TBD</Acknowledgement>
          <Contact>
-            <PersonID>spase://CNES/Person/Chihiro.Tao</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Chihiro.Tao</PersonID>
             <Role>PrincipalInvestigator</Role>
          </Contact>
          <Contact>
-            <PersonID>spase://CNES/Person/Elena.Budnik</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Elena.Budnik</PersonID>
             <Role>TechnicalContact</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalOutput/CDPP-AMDA/TAO/Cassini/tao-cass-sw.xml b/NumericalOutput/CDPP-AMDA/TAO/Cassini/tao-cass-sw.xml
index eed02d9..9ced050 100644
--- a/NumericalOutput/CDPP-AMDA/TAO/Cassini/tao-cass-sw.xml
+++ b/NumericalOutput/CDPP-AMDA/TAO/Cassini/tao-cass-sw.xml
@@ -10,11 +10,11 @@
          <Description>OMNI solar wind 1-hour data is used as model input. Calculation : IRAP.</Description>
          <Acknowledgement>TBD</Acknowledgement>
          <Contact>
-            <PersonID>spase://CNES/Person/Chihiro.Tao</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Chihiro.Tao</PersonID>
             <Role>PrincipalInvestigator</Role>
          </Contact>
          <Contact>
-            <PersonID>spase://CNES/Person/Elena.Budnik</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Elena.Budnik</PersonID>
             <Role>TechnicalContact</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalOutput/CDPP-AMDA/TAO/Juno/tao-juno-sw.xml b/NumericalOutput/CDPP-AMDA/TAO/Juno/tao-juno-sw.xml
index dc8c7c2..284fc69 100644
--- a/NumericalOutput/CDPP-AMDA/TAO/Juno/tao-juno-sw.xml
+++ b/NumericalOutput/CDPP-AMDA/TAO/Juno/tao-juno-sw.xml
@@ -10,11 +10,11 @@
          <Description>OMNI solar wind 1-hour data is used as model input. Calculation : IRAP.</Description>
          <Acknowledgement>TBD</Acknowledgement>
          <Contact>
-            <PersonID>spase://CNES/Person/Chihiro.Tao</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Chihiro.Tao</PersonID>
             <Role>PrincipalInvestigator</Role>
          </Contact>
          <Contact>
-            <PersonID>spase://CNES/Person/Elena.Budnik</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Elena.Budnik</PersonID>
             <Role>TechnicalContact</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalOutput/CDPP-AMDA/TAO/Jupiter/tao-jup-dsc.xml b/NumericalOutput/CDPP-AMDA/TAO/Jupiter/tao-jup-dsc.xml
index 09115a9..20b7b2b 100644
--- a/NumericalOutput/CDPP-AMDA/TAO/Jupiter/tao-jup-dsc.xml
+++ b/NumericalOutput/CDPP-AMDA/TAO/Jupiter/tao-jup-dsc.xml
@@ -10,11 +10,11 @@
          <Description>DSCOVR FC solar wind 1-min data is used as model input. Calculation : IRAP.</Description>
          <Acknowledgement>TBD</Acknowledgement>
          <Contact>
-            <PersonID>spase://CNES/Person/Chihiro.Tao</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Chihiro.Tao</PersonID>
             <Role>PrincipalInvestigator</Role>
          </Contact>
          <Contact>
-            <PersonID>spase://CNES/Person/Elena.Budnik</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Elena.Budnik</PersonID>
             <Role>TechnicalContact</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalOutput/CDPP-AMDA/TAO/Jupiter/tao-jup-sta.xml b/NumericalOutput/CDPP-AMDA/TAO/Jupiter/tao-jup-sta.xml
index cdabdf2..1f1d55d 100644
--- a/NumericalOutput/CDPP-AMDA/TAO/Jupiter/tao-jup-sta.xml
+++ b/NumericalOutput/CDPP-AMDA/TAO/Jupiter/tao-jup-sta.xml
@@ -10,11 +10,11 @@
          <Description>Stereo-A PLASTIC solar wind 1-min data is used as model input. Calculation : IRAP.</Description>
          <Acknowledgement>TBD</Acknowledgement>
          <Contact>
-            <PersonID>spase://CNES/Person/Chihiro.Tao</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Chihiro.Tao</PersonID>
             <Role>PrincipalInvestigator</Role>
          </Contact>
          <Contact>
-            <PersonID>spase://CNES/Person/Elena.Budnik</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Elena.Budnik</PersonID>
             <Role>TechnicalContact</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalOutput/CDPP-AMDA/TAO/Jupiter/tao-jup-stb.xml b/NumericalOutput/CDPP-AMDA/TAO/Jupiter/tao-jup-stb.xml
index bed9aec..efb9d67 100644
--- a/NumericalOutput/CDPP-AMDA/TAO/Jupiter/tao-jup-stb.xml
+++ b/NumericalOutput/CDPP-AMDA/TAO/Jupiter/tao-jup-stb.xml
@@ -10,11 +10,11 @@
          <Description>Stereo-B PLASTIC solar wind 1-min data is used as model input. Calculation : IRAP.</Description>
          <Acknowledgement>TBD</Acknowledgement>
          <Contact>
-            <PersonID>spase://CNES/Person/Chihiro.Tao</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Chihiro.Tao</PersonID>
             <Role>PrincipalInvestigator</Role>
          </Contact>
          <Contact>
-            <PersonID>spase://CNES/Person/Elena.Budnik</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Elena.Budnik</PersonID>
             <Role>TechnicalContact</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalOutput/CDPP-AMDA/TAO/Jupiter/tao-jup-sw.xml b/NumericalOutput/CDPP-AMDA/TAO/Jupiter/tao-jup-sw.xml
index c4220e7..c9710f4 100644
--- a/NumericalOutput/CDPP-AMDA/TAO/Jupiter/tao-jup-sw.xml
+++ b/NumericalOutput/CDPP-AMDA/TAO/Jupiter/tao-jup-sw.xml
@@ -10,11 +10,11 @@
          <Description>OMNI solar wind 1-hour data is used as model input. Calculation : IRAP.</Description>
          <Acknowledgement>TBD</Acknowledgement>
          <Contact>
-            <PersonID>spase://CNES/Person/Chihiro.Tao</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Chihiro.Tao</PersonID>
             <Role>PrincipalInvestigator</Role>
          </Contact>
          <Contact>
-            <PersonID>spase://CNES/Person/Elena.Budnik</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Elena.Budnik</PersonID>
             <Role>TechnicalContact</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalOutput/CDPP-AMDA/TAO/Jupiter/tao-jup-swrt.xml b/NumericalOutput/CDPP-AMDA/TAO/Jupiter/tao-jup-swrt.xml
index 9cd3df3..73b100f 100644
--- a/NumericalOutput/CDPP-AMDA/TAO/Jupiter/tao-jup-swrt.xml
+++ b/NumericalOutput/CDPP-AMDA/TAO/Jupiter/tao-jup-swrt.xml
@@ -10,11 +10,11 @@
          <Description>ACE RealTime solar wind 1-min data from NOAA (ftp.swpc.noaa.gov) is used as model input. Calculation : IRAP.</Description>
          <Acknowledgement>TBD</Acknowledgement>
          <Contact>
-            <PersonID>spase://CNES/Person/Chihiro.Tao</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Chihiro.Tao</PersonID>
             <Role>PrincipalInvestigator</Role>
          </Contact>
          <Contact>
-            <PersonID>spase://CNES/Person/Elena.Budnik</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Elena.Budnik</PersonID>
             <Role>TechnicalContact</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalOutput/CDPP-AMDA/TAO/Mars/tao-mars-dsc.xml b/NumericalOutput/CDPP-AMDA/TAO/Mars/tao-mars-dsc.xml
index e160efe..3332355 100644
--- a/NumericalOutput/CDPP-AMDA/TAO/Mars/tao-mars-dsc.xml
+++ b/NumericalOutput/CDPP-AMDA/TAO/Mars/tao-mars-dsc.xml
@@ -10,11 +10,11 @@
          <Description>DSCOVR FC solar wind 1-min data is used as model input. Calculation : IRAP.</Description>
          <Acknowledgement>TBD</Acknowledgement>
          <Contact>
-            <PersonID>spase://CNES/Person/Chihiro.Tao</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Chihiro.Tao</PersonID>
             <Role>PrincipalInvestigator</Role>
          </Contact>
          <Contact>
-            <PersonID>spase://CNES/Person/Elena.Budnik</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Elena.Budnik</PersonID>
             <Role>TechnicalContact</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalOutput/CDPP-AMDA/TAO/Mars/tao-mars-sta.xml b/NumericalOutput/CDPP-AMDA/TAO/Mars/tao-mars-sta.xml
index 310fe02..cd80d2e 100644
--- a/NumericalOutput/CDPP-AMDA/TAO/Mars/tao-mars-sta.xml
+++ b/NumericalOutput/CDPP-AMDA/TAO/Mars/tao-mars-sta.xml
@@ -10,11 +10,11 @@
          <Description>Stereo-A PLASTIC solar wind 1-min data is used as model input. Calculation : IRAP.</Description>
          <Acknowledgement>TBD</Acknowledgement>
          <Contact>
-            <PersonID>spase://CNES/Person/Chihiro.Tao</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Chihiro.Tao</PersonID>
             <Role>PrincipalInvestigator</Role>
          </Contact>
          <Contact>
-            <PersonID>spase://CNES/Person/Elena.Budnik</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Elena.Budnik</PersonID>
             <Role>TechnicalContact</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalOutput/CDPP-AMDA/TAO/Mars/tao-mars-stb.xml b/NumericalOutput/CDPP-AMDA/TAO/Mars/tao-mars-stb.xml
index 4586ff4..6443335 100644
--- a/NumericalOutput/CDPP-AMDA/TAO/Mars/tao-mars-stb.xml
+++ b/NumericalOutput/CDPP-AMDA/TAO/Mars/tao-mars-stb.xml
@@ -10,11 +10,11 @@
          <Description>Stereo-B PLASTIC solar wind 1-min data is used as model input. Calculation : IRAP.</Description>
          <Acknowledgement>TBD</Acknowledgement>
          <Contact>
-            <PersonID>spase://CNES/Person/Chihiro.Tao</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Chihiro.Tao</PersonID>
             <Role>PrincipalInvestigator</Role>
          </Contact>
          <Contact>
-            <PersonID>spase://CNES/Person/Elena.Budnik</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Elena.Budnik</PersonID>
             <Role>TechnicalContact</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalOutput/CDPP-AMDA/TAO/Mars/tao-mars-sw.xml b/NumericalOutput/CDPP-AMDA/TAO/Mars/tao-mars-sw.xml
index 2096fef..ad2fb77 100644
--- a/NumericalOutput/CDPP-AMDA/TAO/Mars/tao-mars-sw.xml
+++ b/NumericalOutput/CDPP-AMDA/TAO/Mars/tao-mars-sw.xml
@@ -10,11 +10,11 @@
          <Description>OMNI solar wind 1-hour data is used as model input. Calculation : IRAP.</Description>
          <Acknowledgement>TBD</Acknowledgement>
          <Contact>
-            <PersonID>spase://CNES/Person/Chihiro.Tao</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Chihiro.Tao</PersonID>
             <Role>PrincipalInvestigator</Role>
          </Contact>
          <Contact>
-            <PersonID>spase://CNES/Person/Elena.Budnik</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Elena.Budnik</PersonID>
             <Role>TechnicalContact</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalOutput/CDPP-AMDA/TAO/Mars/tao-mars-swrt.xml b/NumericalOutput/CDPP-AMDA/TAO/Mars/tao-mars-swrt.xml
index 21fdf35..edc419e 100644
--- a/NumericalOutput/CDPP-AMDA/TAO/Mars/tao-mars-swrt.xml
+++ b/NumericalOutput/CDPP-AMDA/TAO/Mars/tao-mars-swrt.xml
@@ -10,11 +10,11 @@
          <Description>ACE RealTime solar wind 1-min data from NOAA (ftp.swpc.noaa.gov) is used as model input. Calculation : IRAP.</Description>
          <Acknowledgement>TBD</Acknowledgement>
          <Contact>
-            <PersonID>spase://CNES/Person/Chihiro.Tao</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Chihiro.Tao</PersonID>
             <Role>PrincipalInvestigator</Role>
          </Contact>
          <Contact>
-            <PersonID>spase://CNES/Person/Elena.Budnik</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Elena.Budnik</PersonID>
             <Role>TechnicalContact</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalOutput/CDPP-AMDA/TAO/Mercury/tao-mercury-dsc.xml b/NumericalOutput/CDPP-AMDA/TAO/Mercury/tao-mercury-dsc.xml
index f345319..83b35e1 100644
--- a/NumericalOutput/CDPP-AMDA/TAO/Mercury/tao-mercury-dsc.xml
+++ b/NumericalOutput/CDPP-AMDA/TAO/Mercury/tao-mercury-dsc.xml
@@ -10,11 +10,11 @@
          <Description>DSCOVR FC solar wind 1-min data is used as model input. Calculation : IRAP.</Description>
          <Acknowledgement>TBD</Acknowledgement>
          <Contact>
-            <PersonID>spase://CNES/Person/Chihiro.Tao</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Chihiro.Tao</PersonID>
             <Role>PrincipalInvestigator</Role>
          </Contact>
          <Contact>
-            <PersonID>spase://CNES/Person/Elena.Budnik</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Elena.Budnik</PersonID>
             <Role>TechnicalContact</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalOutput/CDPP-AMDA/TAO/Mercury/tao-mercury-sta.xml b/NumericalOutput/CDPP-AMDA/TAO/Mercury/tao-mercury-sta.xml
index 361806a..4916208 100644
--- a/NumericalOutput/CDPP-AMDA/TAO/Mercury/tao-mercury-sta.xml
+++ b/NumericalOutput/CDPP-AMDA/TAO/Mercury/tao-mercury-sta.xml
@@ -10,11 +10,11 @@
          <Description>Stereo-A PLASTIC solar wind 1-min data is used as model input. Calculation : IRAP.</Description>
          <Acknowledgement>TBD</Acknowledgement>
          <Contact>
-            <PersonID>spase://CNES/Person/Chihiro.Tao</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Chihiro.Tao</PersonID>
             <Role>PrincipalInvestigator</Role>
          </Contact>
          <Contact>
-            <PersonID>spase://CNES/Person/Elena.Budnik</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Elena.Budnik</PersonID>
             <Role>TechnicalContact</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalOutput/CDPP-AMDA/TAO/Mercury/tao-mercury-stb.xml b/NumericalOutput/CDPP-AMDA/TAO/Mercury/tao-mercury-stb.xml
index 16f3464..292963a 100644
--- a/NumericalOutput/CDPP-AMDA/TAO/Mercury/tao-mercury-stb.xml
+++ b/NumericalOutput/CDPP-AMDA/TAO/Mercury/tao-mercury-stb.xml
@@ -10,11 +10,11 @@
          <Description>Stereo-B PLASTIC solar wind 1-min data is used as model input. Calculation : IRAP.</Description>
          <Acknowledgement>TBD</Acknowledgement>
          <Contact>
-            <PersonID>spase://CNES/Person/Chihiro.Tao</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Chihiro.Tao</PersonID>
             <Role>PrincipalInvestigator</Role>
          </Contact>
          <Contact>
-            <PersonID>spase://CNES/Person/Elena.Budnik</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Elena.Budnik</PersonID>
             <Role>TechnicalContact</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalOutput/CDPP-AMDA/TAO/Mercury/tao-mercury-sw.xml b/NumericalOutput/CDPP-AMDA/TAO/Mercury/tao-mercury-sw.xml
index 413467c..293cc8d 100644
--- a/NumericalOutput/CDPP-AMDA/TAO/Mercury/tao-mercury-sw.xml
+++ b/NumericalOutput/CDPP-AMDA/TAO/Mercury/tao-mercury-sw.xml
@@ -10,11 +10,11 @@
          <Description>OMNI solar wind 1-hour data is used as model input. Calculation : IRAP.</Description>
          <Acknowledgement>TBD</Acknowledgement>
          <Contact>
-            <PersonID>spase://CNES/Person/Chihiro.Tao</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Chihiro.Tao</PersonID>
             <Role>PrincipalInvestigator</Role>
          </Contact>
          <Contact>
-            <PersonID>spase://CNES/Person/Elena.Budnik</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Elena.Budnik</PersonID>
             <Role>TechnicalContact</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalOutput/CDPP-AMDA/TAO/Mercury/tao-mercury-swrt.xml b/NumericalOutput/CDPP-AMDA/TAO/Mercury/tao-mercury-swrt.xml
index 95612f1..f743a35 100644
--- a/NumericalOutput/CDPP-AMDA/TAO/Mercury/tao-mercury-swrt.xml
+++ b/NumericalOutput/CDPP-AMDA/TAO/Mercury/tao-mercury-swrt.xml
@@ -10,11 +10,11 @@
          <Description>ACE RealTime solar wind 1-min data from NOAA (ftp.swpc.noaa.gov) is used as model input. Calculation : IRAP.</Description>
          <Acknowledgement>TBD</Acknowledgement>
          <Contact>
-            <PersonID>spase://CNES/Person/Chihiro.Tao</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Chihiro.Tao</PersonID>
             <Role>PrincipalInvestigator</Role>
          </Contact>
          <Contact>
-            <PersonID>spase://CNES/Person/Elena.Budnik</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Elena.Budnik</PersonID>
             <Role>TechnicalContact</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalOutput/CDPP-AMDA/TAO/Neptune/tao-nep-dsc.xml b/NumericalOutput/CDPP-AMDA/TAO/Neptune/tao-nep-dsc.xml
index 4cf1aaa..b46bf3a 100644
--- a/NumericalOutput/CDPP-AMDA/TAO/Neptune/tao-nep-dsc.xml
+++ b/NumericalOutput/CDPP-AMDA/TAO/Neptune/tao-nep-dsc.xml
@@ -10,11 +10,11 @@
          <Description>DSCOVR FC solar wind 1-min data is used as model input. Calculation : IRAP.</Description>
          <Acknowledgement>TBD</Acknowledgement>
          <Contact>
-            <PersonID>spase://CNES/Person/Chihiro.Tao</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Chihiro.Tao</PersonID>
             <Role>PrincipalInvestigator</Role>
          </Contact>
          <Contact>
-            <PersonID>spase://CNES/Person/Elena.Budnik</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Elena.Budnik</PersonID>
             <Role>TechnicalContact</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalOutput/CDPP-AMDA/TAO/Neptune/tao-nep-sta.xml b/NumericalOutput/CDPP-AMDA/TAO/Neptune/tao-nep-sta.xml
index cf216e1..a628a0b 100644
--- a/NumericalOutput/CDPP-AMDA/TAO/Neptune/tao-nep-sta.xml
+++ b/NumericalOutput/CDPP-AMDA/TAO/Neptune/tao-nep-sta.xml
@@ -10,11 +10,11 @@
          <Description>Stereo-A PLASTIC solar wind 1-min data is used as model input. Calculation : IRAP.</Description>
          <Acknowledgement>TBD</Acknowledgement>
          <Contact>
-            <PersonID>spase://CNES/Person/Chihiro.Tao</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Chihiro.Tao</PersonID>
             <Role>PrincipalInvestigator</Role>
          </Contact>
          <Contact>
-            <PersonID>spase://CNES/Person/Elena.Budnik</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Elena.Budnik</PersonID>
             <Role>TechnicalContact</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalOutput/CDPP-AMDA/TAO/Neptune/tao-nep-stb.xml b/NumericalOutput/CDPP-AMDA/TAO/Neptune/tao-nep-stb.xml
index d40730c..e01b7ab 100644
--- a/NumericalOutput/CDPP-AMDA/TAO/Neptune/tao-nep-stb.xml
+++ b/NumericalOutput/CDPP-AMDA/TAO/Neptune/tao-nep-stb.xml
@@ -10,11 +10,11 @@
          <Description>Stereo-B PLASTIC solar wind 1-min data is used as model input. Calculation : IRAP.</Description>
          <Acknowledgement>TBD</Acknowledgement>
          <Contact>
-            <PersonID>spase://CNES/Person/Chihiro.Tao</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Chihiro.Tao</PersonID>
             <Role>PrincipalInvestigator</Role>
          </Contact>
          <Contact>
-            <PersonID>spase://CNES/Person/Elena.Budnik</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Elena.Budnik</PersonID>
             <Role>TechnicalContact</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalOutput/CDPP-AMDA/TAO/Neptune/tao-nep-sw.xml b/NumericalOutput/CDPP-AMDA/TAO/Neptune/tao-nep-sw.xml
index 530587f..01e4127 100644
--- a/NumericalOutput/CDPP-AMDA/TAO/Neptune/tao-nep-sw.xml
+++ b/NumericalOutput/CDPP-AMDA/TAO/Neptune/tao-nep-sw.xml
@@ -10,11 +10,11 @@
          <Description>OMNI solar wind 1-hour data is used as model input. Calculation : IRAP.</Description>
          <Acknowledgement>TBD</Acknowledgement>
          <Contact>
-            <PersonID>spase://CNES/Person/Chihiro.Tao</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Chihiro.Tao</PersonID>
             <Role>PrincipalInvestigator</Role>
          </Contact>
          <Contact>
-            <PersonID>spase://CNES/Person/Elena.Budnik</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Elena.Budnik</PersonID>
             <Role>TechnicalContact</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalOutput/CDPP-AMDA/TAO/Neptune/tao-nep-swrt.xml b/NumericalOutput/CDPP-AMDA/TAO/Neptune/tao-nep-swrt.xml
index 52d3f52..33b87bf 100644
--- a/NumericalOutput/CDPP-AMDA/TAO/Neptune/tao-nep-swrt.xml
+++ b/NumericalOutput/CDPP-AMDA/TAO/Neptune/tao-nep-swrt.xml
@@ -10,11 +10,11 @@
          <Description>ACE RealTime solar wind 1-min data from NOAA (ftp.swpc.noaa.gov) is used as model input. Calculation : IRAP.</Description>
          <Acknowledgement>TBD</Acknowledgement>
          <Contact>
-            <PersonID>spase://CNES/Person/Chihiro.Tao</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Chihiro.Tao</PersonID>
             <Role>PrincipalInvestigator</Role>
          </Contact>
          <Contact>
-            <PersonID>spase://CNES/Person/Elena.Budnik</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Elena.Budnik</PersonID>
             <Role>TechnicalContact</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalOutput/CDPP-AMDA/TAO/Psp/tao-psp-dsc.xml b/NumericalOutput/CDPP-AMDA/TAO/Psp/tao-psp-dsc.xml
index 8e01b02..73ba982 100644
--- a/NumericalOutput/CDPP-AMDA/TAO/Psp/tao-psp-dsc.xml
+++ b/NumericalOutput/CDPP-AMDA/TAO/Psp/tao-psp-dsc.xml
@@ -10,11 +10,11 @@
          <Description>ACE Real Time solar wind 1-min data from NOAA (ftp.swpc.noaa.gov) is used as model input. Calculation : IRAP.</Description>
          <Acknowledgement>TBD</Acknowledgement>
          <Contact>
-            <PersonID>spase://CNES/Person/Chihiro.Tao</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Chihiro.Tao</PersonID>
             <Role>PrincipalInvestigator</Role>
          </Contact>
          <Contact>
-            <PersonID>spase://CNES/Person/Elena.Budnik</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Elena.Budnik</PersonID>
             <Role>TechnicalContact</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalOutput/CDPP-AMDA/TAO/Psp/tao-psp-sta.xml b/NumericalOutput/CDPP-AMDA/TAO/Psp/tao-psp-sta.xml
index 2269b1a..2158a11 100644
--- a/NumericalOutput/CDPP-AMDA/TAO/Psp/tao-psp-sta.xml
+++ b/NumericalOutput/CDPP-AMDA/TAO/Psp/tao-psp-sta.xml
@@ -10,11 +10,11 @@
          <Description>Stereo-A PLASTIC solar wind 1-min data is used as model input. Calculation : IRAP.</Description>
          <Acknowledgement>TBD</Acknowledgement>
          <Contact>
-            <PersonID>spase://CNES/Person/Chihiro.Tao</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Chihiro.Tao</PersonID>
             <Role>PrincipalInvestigator</Role>
          </Contact>
          <Contact>
-            <PersonID>spase://CNES/Person/Elena.Budnik</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Elena.Budnik</PersonID>
             <Role>TechnicalContact</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalOutput/CDPP-AMDA/TAO/Psp/tao-psp-sw.xml b/NumericalOutput/CDPP-AMDA/TAO/Psp/tao-psp-sw.xml
index 6226c7f..09029f6 100644
--- a/NumericalOutput/CDPP-AMDA/TAO/Psp/tao-psp-sw.xml
+++ b/NumericalOutput/CDPP-AMDA/TAO/Psp/tao-psp-sw.xml
@@ -10,11 +10,11 @@
          <Description>OMNI solar wind 1-hour data is used as model input. Calculation : IRAP.</Description>
          <Acknowledgement>TBD</Acknowledgement>
          <Contact>
-            <PersonID>spase://CNES/Person/Chihiro.Tao</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Chihiro.Tao</PersonID>
             <Role>PrincipalInvestigator</Role>
          </Contact>
          <Contact>
-            <PersonID>spase://CNES/Person/Elena.Budnik</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Elena.Budnik</PersonID>
             <Role>TechnicalContact</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalOutput/CDPP-AMDA/TAO/Psp/tao-psp-swrt.xml b/NumericalOutput/CDPP-AMDA/TAO/Psp/tao-psp-swrt.xml
index 73515fb..aad32f0 100644
--- a/NumericalOutput/CDPP-AMDA/TAO/Psp/tao-psp-swrt.xml
+++ b/NumericalOutput/CDPP-AMDA/TAO/Psp/tao-psp-swrt.xml
@@ -10,11 +10,11 @@
 	 <Description>ACE Real Time solar wind 1-min data from NOAA (ftp.swpc.noaa.gov) is used as model input. Calculation : IRAP.</Description>
          <Acknowledgement>TBD</Acknowledgement>
          <Contact>
-            <PersonID>spase://CNES/Person/Chihiro.Tao</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Chihiro.Tao</PersonID>
             <Role>PrincipalInvestigator</Role>
          </Contact>
          <Contact>
-            <PersonID>spase://CNES/Person/Elena.Budnik</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Elena.Budnik</PersonID>
             <Role>TechnicalContact</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalOutput/CDPP-AMDA/TAO/Rosetta/tao-ros-sw.xml b/NumericalOutput/CDPP-AMDA/TAO/Rosetta/tao-ros-sw.xml
index 2a6f1a9..cb3d2d6 100644
--- a/NumericalOutput/CDPP-AMDA/TAO/Rosetta/tao-ros-sw.xml
+++ b/NumericalOutput/CDPP-AMDA/TAO/Rosetta/tao-ros-sw.xml
@@ -10,11 +10,11 @@
          <Description>OMNI solar wind 1-hour data is used as model input. Calculation : IRAP.</Description>
          <Acknowledgement>TBD</Acknowledgement>
          <Contact>
-            <PersonID>spase://CNES/Person/Chihiro.Tao</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Chihiro.Tao</PersonID>
             <Role>PrincipalInvestigator</Role>
          </Contact>
          <Contact>
-            <PersonID>spase://CNES/Person/Elena.Budnik</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Elena.Budnik</PersonID>
             <Role>TechnicalContact</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalOutput/CDPP-AMDA/TAO/Saturn/tao-sat-dsc.xml b/NumericalOutput/CDPP-AMDA/TAO/Saturn/tao-sat-dsc.xml
index a7900d1..fc27240 100644
--- a/NumericalOutput/CDPP-AMDA/TAO/Saturn/tao-sat-dsc.xml
+++ b/NumericalOutput/CDPP-AMDA/TAO/Saturn/tao-sat-dsc.xml
@@ -10,11 +10,11 @@
          <Description>DSCOVR FC solar wind 1-min data is used as model input. Calculation : IRAP.</Description>
          <Acknowledgement>TBD</Acknowledgement>
          <Contact>
-            <PersonID>spase://CNES/Person/Chihiro.Tao</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Chihiro.Tao</PersonID>
             <Role>PrincipalInvestigator</Role>
          </Contact>
          <Contact>
-            <PersonID>spase://CNES/Person/Elena.Budnik</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Elena.Budnik</PersonID>
             <Role>TechnicalContact</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalOutput/CDPP-AMDA/TAO/Saturn/tao-sat-sta.xml b/NumericalOutput/CDPP-AMDA/TAO/Saturn/tao-sat-sta.xml
index 0038890..30958cb 100644
--- a/NumericalOutput/CDPP-AMDA/TAO/Saturn/tao-sat-sta.xml
+++ b/NumericalOutput/CDPP-AMDA/TAO/Saturn/tao-sat-sta.xml
@@ -10,11 +10,11 @@
          <Description>Stereo-A PLASTIC solar wind 1-min data is used as model input. Calculation : IRAP.</Description>
          <Acknowledgement>TBD</Acknowledgement>
          <Contact>
-            <PersonID>spase://CNES/Person/Chihiro.Tao</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Chihiro.Tao</PersonID>
             <Role>PrincipalInvestigator</Role>
          </Contact>
          <Contact>
-            <PersonID>spase://CNES/Person/Elena.Budnik</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Elena.Budnik</PersonID>
             <Role>TechnicalContact</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalOutput/CDPP-AMDA/TAO/Saturn/tao-sat-stb.xml b/NumericalOutput/CDPP-AMDA/TAO/Saturn/tao-sat-stb.xml
index af814b0..994a15f 100644
--- a/NumericalOutput/CDPP-AMDA/TAO/Saturn/tao-sat-stb.xml
+++ b/NumericalOutput/CDPP-AMDA/TAO/Saturn/tao-sat-stb.xml
@@ -10,11 +10,11 @@
          <Description>Stereo-B PLASTIC solar wind 1-min data is used as model input. Calculation : IRAP.</Description>
          <Acknowledgement>TBD</Acknowledgement>
          <Contact>
-            <PersonID>spase://CNES/Person/Chihiro.Tao</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Chihiro.Tao</PersonID>
             <Role>PrincipalInvestigator</Role>
          </Contact>
          <Contact>
-            <PersonID>spase://CNES/Person/Elena.Budnik</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Elena.Budnik</PersonID>
             <Role>TechnicalContact</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalOutput/CDPP-AMDA/TAO/Saturn/tao-sat-sw.xml b/NumericalOutput/CDPP-AMDA/TAO/Saturn/tao-sat-sw.xml
index 33830d8..17cf0ba 100644
--- a/NumericalOutput/CDPP-AMDA/TAO/Saturn/tao-sat-sw.xml
+++ b/NumericalOutput/CDPP-AMDA/TAO/Saturn/tao-sat-sw.xml
@@ -10,11 +10,11 @@
          <Description>OMNI solar wind 1-hour data is used as model input. Calculation : IRAP.</Description>
          <Acknowledgement>TBD</Acknowledgement>
          <Contact>
-            <PersonID>spase://CNES/Person/Chihiro.Tao</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Chihiro.Tao</PersonID>
             <Role>PrincipalInvestigator</Role>
          </Contact>
          <Contact>
-            <PersonID>spase://CNES/Person/Elena.Budnik</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Elena.Budnik</PersonID>
             <Role>TechnicalContact</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalOutput/CDPP-AMDA/TAO/Saturn/tao-sat-swrt.xml b/NumericalOutput/CDPP-AMDA/TAO/Saturn/tao-sat-swrt.xml
index 6f5cdc5..f876db2 100644
--- a/NumericalOutput/CDPP-AMDA/TAO/Saturn/tao-sat-swrt.xml
+++ b/NumericalOutput/CDPP-AMDA/TAO/Saturn/tao-sat-swrt.xml
@@ -10,11 +10,11 @@
          <Description>ACE RealTime solar wind 1-min data from NOAA (ftp.swpc.noaa.gov) is used as model input. Calculation : IRAP.</Description>
          <Acknowledgement>TBD</Acknowledgement>
          <Contact>
-            <PersonID>spase://CNES/Person/Chihiro.Tao</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Chihiro.Tao</PersonID>
             <Role>PrincipalInvestigator</Role>
          </Contact>
          <Contact>
-            <PersonID>spase://CNES/Person/Elena.Budnik</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Elena.Budnik</PersonID>
             <Role>TechnicalContact</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalOutput/CDPP-AMDA/TAO/So/tao-so-dsc.xml b/NumericalOutput/CDPP-AMDA/TAO/So/tao-so-dsc.xml
index e577ad9..3e04dfb 100644
--- a/NumericalOutput/CDPP-AMDA/TAO/So/tao-so-dsc.xml
+++ b/NumericalOutput/CDPP-AMDA/TAO/So/tao-so-dsc.xml
@@ -10,11 +10,11 @@
 	 <Description>DSCOVR FC solar wind 1-min data is used as model input. Calculation : IRAP.</Description>
          <Acknowledgement>TBD</Acknowledgement>
          <Contact>
-            <PersonID>spase://CNES/Person/Chihiro.Tao</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Chihiro.Tao</PersonID>
             <Role>PrincipalInvestigator</Role>
          </Contact>
          <Contact>
-            <PersonID>spase://CNES/Person/Elena.Budnik</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Elena.Budnik</PersonID>
             <Role>TechnicalContact</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalOutput/CDPP-AMDA/TAO/So/tao-so-sw.xml b/NumericalOutput/CDPP-AMDA/TAO/So/tao-so-sw.xml
index e38d0f3..f5f56bc 100644
--- a/NumericalOutput/CDPP-AMDA/TAO/So/tao-so-sw.xml
+++ b/NumericalOutput/CDPP-AMDA/TAO/So/tao-so-sw.xml
@@ -10,11 +10,11 @@
          <Description>OMNI solar wind 1-hour data is used as model input. Calculation : IRAP.</Description>
          <Acknowledgement>TBD</Acknowledgement>
          <Contact>
-            <PersonID>spase://CNES/Person/Chihiro.Tao</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Chihiro.Tao</PersonID>
             <Role>PrincipalInvestigator</Role>
          </Contact>
          <Contact>
-            <PersonID>spase://CNES/Person/Elena.Budnik</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Elena.Budnik</PersonID>
             <Role>TechnicalContact</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalOutput/CDPP-AMDA/TAO/Uranus/tao-ura-dsc.xml b/NumericalOutput/CDPP-AMDA/TAO/Uranus/tao-ura-dsc.xml
index 4efb461..0d466bb 100644
--- a/NumericalOutput/CDPP-AMDA/TAO/Uranus/tao-ura-dsc.xml
+++ b/NumericalOutput/CDPP-AMDA/TAO/Uranus/tao-ura-dsc.xml
@@ -10,11 +10,11 @@
          <Description>DSCOVR FC solar wind 1-min data is used as model input. Calculation : IRAP.</Description>
          <Acknowledgement>TBD</Acknowledgement>
          <Contact>
-            <PersonID>spase://CNES/Person/Chihiro.Tao</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Chihiro.Tao</PersonID>
             <Role>PrincipalInvestigator</Role>
          </Contact>
          <Contact>
-            <PersonID>spase://CNES/Person/Elena.Budnik</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Elena.Budnik</PersonID>
             <Role>TechnicalContact</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalOutput/CDPP-AMDA/TAO/Uranus/tao-ura-sta.xml b/NumericalOutput/CDPP-AMDA/TAO/Uranus/tao-ura-sta.xml
index 833fb3a..fa43c19 100644
--- a/NumericalOutput/CDPP-AMDA/TAO/Uranus/tao-ura-sta.xml
+++ b/NumericalOutput/CDPP-AMDA/TAO/Uranus/tao-ura-sta.xml
@@ -10,11 +10,11 @@
          <Description>Stereo-A PLASTIC solar wind 1-min data is used as model input. Calculation : IRAP.</Description>
          <Acknowledgement>TBD</Acknowledgement>
          <Contact>
-            <PersonID>spase://CNES/Person/Chihiro.Tao</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Chihiro.Tao</PersonID>
             <Role>PrincipalInvestigator</Role>
          </Contact>
          <Contact>
-            <PersonID>spase://CNES/Person/Elena.Budnik</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Elena.Budnik</PersonID>
             <Role>TechnicalContact</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalOutput/CDPP-AMDA/TAO/Uranus/tao-ura-stb.xml b/NumericalOutput/CDPP-AMDA/TAO/Uranus/tao-ura-stb.xml
index e497a68..c64cdc5 100644
--- a/NumericalOutput/CDPP-AMDA/TAO/Uranus/tao-ura-stb.xml
+++ b/NumericalOutput/CDPP-AMDA/TAO/Uranus/tao-ura-stb.xml
@@ -10,11 +10,11 @@
          <Description>Stereo-B PLASTIC solar wind 1-min data is used as model input. Calculation : IRAP.</Description>
          <Acknowledgement>TBD</Acknowledgement>
          <Contact>
-            <PersonID>spase://CNES/Person/Chihiro.Tao</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Chihiro.Tao</PersonID>
             <Role>PrincipalInvestigator</Role>
          </Contact>
          <Contact>
-            <PersonID>spase://CNES/Person/Elena.Budnik</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Elena.Budnik</PersonID>
             <Role>TechnicalContact</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalOutput/CDPP-AMDA/TAO/Uranus/tao-ura-sw.xml b/NumericalOutput/CDPP-AMDA/TAO/Uranus/tao-ura-sw.xml
index abbedc6..7042b0b 100644
--- a/NumericalOutput/CDPP-AMDA/TAO/Uranus/tao-ura-sw.xml
+++ b/NumericalOutput/CDPP-AMDA/TAO/Uranus/tao-ura-sw.xml
@@ -10,11 +10,11 @@
          <Description>OMNI solar wind 1-hour data is used as model input. Calculation : IRAP.</Description>
          <Acknowledgement>TBD</Acknowledgement>
          <Contact>
-            <PersonID>spase://CNES/Person/Chihiro.Tao</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Chihiro.Tao</PersonID>
             <Role>PrincipalInvestigator</Role>
          </Contact>
          <Contact>
-            <PersonID>spase://CNES/Person/Elena.Budnik</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Elena.Budnik</PersonID>
             <Role>TechnicalContact</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalOutput/CDPP-AMDA/TAO/Uranus/tao-ura-swrt.xml b/NumericalOutput/CDPP-AMDA/TAO/Uranus/tao-ura-swrt.xml
index 2c14f6b..a0384d2 100644
--- a/NumericalOutput/CDPP-AMDA/TAO/Uranus/tao-ura-swrt.xml
+++ b/NumericalOutput/CDPP-AMDA/TAO/Uranus/tao-ura-swrt.xml
@@ -10,11 +10,11 @@
          <Description>ACE RealTime solar wind 1-min data from NOAA (ftp.swpc.noaa.gov) is used as model input. Calculation : IRAP.</Description>
          <Acknowledgement>TBD</Acknowledgement>
          <Contact>
-            <PersonID>spase://CNES/Person/Chihiro.Tao</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Chihiro.Tao</PersonID>
             <Role>PrincipalInvestigator</Role>
          </Contact>
          <Contact>
-            <PersonID>spase://CNES/Person/Elena.Budnik</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Elena.Budnik</PersonID>
             <Role>TechnicalContact</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalOutput/CDPP-AMDA/TAO/Venus/tao-venus-dsc.xml b/NumericalOutput/CDPP-AMDA/TAO/Venus/tao-venus-dsc.xml
index ec10b2b..385c10f 100644
--- a/NumericalOutput/CDPP-AMDA/TAO/Venus/tao-venus-dsc.xml
+++ b/NumericalOutput/CDPP-AMDA/TAO/Venus/tao-venus-dsc.xml
@@ -10,11 +10,11 @@
          <Description>DSCOVR FC solar wind 1-min data is used as model input. Calculation : IRAP.</Description>
          <Acknowledgement>TBD</Acknowledgement>
          <Contact>
-            <PersonID>spase://CNES/Person/Chihiro.Tao</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Chihiro.Tao</PersonID>
             <Role>PrincipalInvestigator</Role>
          </Contact>
          <Contact>
-            <PersonID>spase://CNES/Person/Elena.Budnik</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Elena.Budnik</PersonID>
             <Role>TechnicalContact</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalOutput/CDPP-AMDA/TAO/Venus/tao-venus-sta.xml b/NumericalOutput/CDPP-AMDA/TAO/Venus/tao-venus-sta.xml
index 2bfe7a1..f2834b3 100644
--- a/NumericalOutput/CDPP-AMDA/TAO/Venus/tao-venus-sta.xml
+++ b/NumericalOutput/CDPP-AMDA/TAO/Venus/tao-venus-sta.xml
@@ -10,11 +10,11 @@
          <Description>Stereo-A PLASTIC solar wind 1-min data is used as model input. Calculation : IRAP.</Description>
          <Acknowledgement>TBD</Acknowledgement>
          <Contact>
-            <PersonID>spase://CNES/Person/Chihiro.Tao</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Chihiro.Tao</PersonID>
             <Role>PrincipalInvestigator</Role>
          </Contact>
          <Contact>
-            <PersonID>spase://CNES/Person/Elena.Budnik</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Elena.Budnik</PersonID>
             <Role>TechnicalContact</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalOutput/CDPP-AMDA/TAO/Venus/tao-venus-stb.xml b/NumericalOutput/CDPP-AMDA/TAO/Venus/tao-venus-stb.xml
index 4f989b0..d825e74 100644
--- a/NumericalOutput/CDPP-AMDA/TAO/Venus/tao-venus-stb.xml
+++ b/NumericalOutput/CDPP-AMDA/TAO/Venus/tao-venus-stb.xml
@@ -10,11 +10,11 @@
          <Description>Stereo-B PLASTIC solar wind 1-min data is used as model input. Calculation : IRAP.</Description>
          <Acknowledgement>TBD</Acknowledgement>
          <Contact>
-            <PersonID>spase://CNES/Person/Chihiro.Tao</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Chihiro.Tao</PersonID>
             <Role>PrincipalInvestigator</Role>
          </Contact>
          <Contact>
-            <PersonID>spase://CNES/Person/Elena.Budnik</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Elena.Budnik</PersonID>
             <Role>TechnicalContact</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalOutput/CDPP-AMDA/TAO/Venus/tao-venus-sw.xml b/NumericalOutput/CDPP-AMDA/TAO/Venus/tao-venus-sw.xml
index be67fdc..776b142 100644
--- a/NumericalOutput/CDPP-AMDA/TAO/Venus/tao-venus-sw.xml
+++ b/NumericalOutput/CDPP-AMDA/TAO/Venus/tao-venus-sw.xml
@@ -10,11 +10,11 @@
          <Description>OMNI solar wind 1-hour data is used as model input. Calculation : IRAP.</Description>
          <Acknowledgement>TBD</Acknowledgement>
          <Contact>
-            <PersonID>spase://CNES/Person/Chihiro.Tao</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Chihiro.Tao</PersonID>
             <Role>PrincipalInvestigator</Role>
          </Contact>
          <Contact>
-            <PersonID>spase://CNES/Person/Elena.Budnik</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Elena.Budnik</PersonID>
             <Role>TechnicalContact</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalOutput/CDPP-AMDA/TAO/Venus/tao-venus-swrt.xml b/NumericalOutput/CDPP-AMDA/TAO/Venus/tao-venus-swrt.xml
index 6c2270d..33ca045 100644
--- a/NumericalOutput/CDPP-AMDA/TAO/Venus/tao-venus-swrt.xml
+++ b/NumericalOutput/CDPP-AMDA/TAO/Venus/tao-venus-swrt.xml
@@ -10,11 +10,11 @@
          <Description>ACE RealTime solar wind 1-min data from NOAA (ftp.swpc.noaa.gov) is used as model input. Calculation : IRAP.</Description>
          <Acknowledgement>TBD</Acknowledgement>
          <Contact>
-            <PersonID>spase://CNES/Person/Chihiro.Tao</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Chihiro.Tao</PersonID>
             <Role>PrincipalInvestigator</Role>
          </Contact>
          <Contact>
-            <PersonID>spase://CNES/Person/Elena.Budnik</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Elena.Budnik</PersonID>
             <Role>TechnicalContact</Role>
          </Contact>
          <InformationURL>
diff --git a/NumericalOutput/CDPP-AMDA/TSYG96/b_t96.xml b/NumericalOutput/CDPP-AMDA/TSYG96/b_t96.xml
index ce7595a..b219c8e 100644
--- a/NumericalOutput/CDPP-AMDA/TSYG96/b_t96.xml
+++ b/NumericalOutput/CDPP-AMDA/TSYG96/b_t96.xml
@@ -15,11 +15,11 @@
            </Description>
          <Acknowledgement>TBD</Acknowledgement>
          <Contact>
-            <PersonID>spase://CNES/Person/Nikolai.Tsyganenko</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Nikolai.Tsyganenko</PersonID>
             <Role>PrincipalInvestigator</Role>
          </Contact>
          <Contact>
-            <PersonID>spase://CNES/Person/Elena.Budnik</PersonID>
+            <PersonID>spase://CNES/Person/CDPP-AMDA/Elena.Budnik</PersonID>
             <Role>TechnicalContact</Role>
          </Contact>
          <InformationURL>
diff --git a/Observatory/CDPP-AMDA/Bepi.xml b/Observatory/CDPP-AMDA/Bepi.xml
index 59f1399..b3b2c75 100644
--- a/Observatory/CDPP-AMDA/Bepi.xml
+++ b/Observatory/CDPP-AMDA/Bepi.xml
@@ -16,7 +16,7 @@
         Exploration Agency (JAXA), executed under ESA leadership.    
        </Description>
       <Contact>
-        <PersonID>spase://CNES/Person/J.Benkhoff</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/J.Benkhoff</PersonID>
         <Role>ProjectScientist</Role>
       </Contact>
       <InformationURL>
diff --git a/Observatory/CDPP-AMDA/Cassini.xml b/Observatory/CDPP-AMDA/Cassini.xml
index 230b048..db0cbbb 100644
--- a/Observatory/CDPP-AMDA/Cassini.xml
+++ b/Observatory/CDPP-AMDA/Cassini.xml
@@ -30,7 +30,7 @@ including measuring Saturn’s gravitational and magnetic fields, determining ri
 and making the last views of Enceladus.        
 </Description>
       <Contact>
-        <PersonID>spase://CNES/Person/Linda.Spilker</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Linda.Spilker</PersonID>
         <Role>ProjectScientist</Role>
       </Contact>
       <InformationURL>
diff --git a/Observatory/CDPP-AMDA/DSCOVR.xml b/Observatory/CDPP-AMDA/DSCOVR.xml
index c53d9a9..f18d1bb 100644
--- a/Observatory/CDPP-AMDA/DSCOVR.xml
+++ b/Observatory/CDPP-AMDA/DSCOVR.xml
@@ -16,7 +16,7 @@
         <Role>ProjectScientist</Role>
       </Contact>
       <Contact>       
-        <PersonID>spase://CNES/Person/Doug.Biesecker</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Doug.Biesecker</PersonID>
         <!--<Role>ProgramScientist</Role>-->
         <Role>ProjectScientist</Role>
       </Contact>     
diff --git a/Observatory/CDPP-AMDA/EISCAT.xml b/Observatory/CDPP-AMDA/EISCAT.xml
index 4cded4c..b57d940 100644
--- a/Observatory/CDPP-AMDA/EISCAT.xml
+++ b/Observatory/CDPP-AMDA/EISCAT.xml
@@ -14,7 +14,7 @@
 </Description>
       <Acknowledgement>The authors are grateful to the staff of EISCAT for providing the radar facilities and assistance with making the observations. EISCAT is an international association supported by research organizations in China (CRIRP), Finland (SA), France (CNRS, till end 2006), Germany (DFG), Japan (NIPR and STEL), Norway (NFR), Sweden (VR), and the United Kingdom (STFC).</Acknowledgement>          
          <Contact>     
-        <PersonID>spase://CNES/Person/Craig.Heinselman</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Craig.Heinselman</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>
        <InformationURL>
diff --git a/Observatory/CDPP-AMDA/Ephemerides.xml b/Observatory/CDPP-AMDA/Ephemerides.xml
index d173dd3..7b9327a 100644
--- a/Observatory/CDPP-AMDA/Ephemerides.xml
+++ b/Observatory/CDPP-AMDA/Ephemerides.xml
@@ -9,11 +9,11 @@
       <ReleaseDate>2016-09-27T18:45:12Z</ReleaseDate>
       <Description>Ephemerides are being calculated with the use of SPICE (NAIF) kernels</Description>
       <Contact>       
-        <PersonID>spase://CNES/Person/NAIF</PersonID> 
+        <PersonID>spase://CNES/Person/CDPP-AMDA/NAIF</PersonID> 
         <Role>PrincipalInvestigator</Role>
       </Contact>
       <Contact>       
-        <PersonID>spase://CNES/Person/Elena.Budnik</PersonID> 
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Elena.Budnik</PersonID> 
         <Role>TechnicalContact</Role>
       </Contact>
       <InformationURL>
diff --git a/Observatory/CDPP-AMDA/Fermi.xml b/Observatory/CDPP-AMDA/Fermi.xml
index da89e64..ec948b6 100644
--- a/Observatory/CDPP-AMDA/Fermi.xml
+++ b/Observatory/CDPP-AMDA/Fermi.xml
@@ -18,7 +18,7 @@
       NASA has teamed up with the U.S. Department of Energy and institutions in France, Germany, Japan, Italy and Sweden. General Dynamics was 
       chosen to build the spacecraft. Fermi was launched June 11, 2008 at 12:05 pm EDT.</Description>
       <Contact>
-        <PersonID>spase://CNES/Person/Elizabeth.Hays</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Elizabeth.Hays</PersonID>
         <Role>ProjectScientist</Role>
       </Contact>
       <InformationURL>
diff --git a/Observatory/CDPP-AMDA/Geotail.xml b/Observatory/CDPP-AMDA/Geotail.xml
index 1b10bea..d94b5ad 100644
--- a/Observatory/CDPP-AMDA/Geotail.xml
+++ b/Observatory/CDPP-AMDA/Geotail.xml
@@ -28,11 +28,11 @@
         <Role>ProjectScientist</Role>
       </Contact>
       <Contact>
-        <PersonID>spase://CNES/Person/A.Nishida</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/A.Nishida</PersonID>
         <Role>ProjectScientist</Role>
       </Contact>
       <Contact>
-        <PersonID>spase://CNES/Person/D.Fairfield</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/D.Fairfield</PersonID>
         <Role>ProjectScientist</Role>
       </Contact>
       <InformationURL>
diff --git a/Observatory/CDPP-AMDA/Interball-Tail.xml b/Observatory/CDPP-AMDA/Interball-Tail.xml
index d839654..2bce7ab 100644
--- a/Observatory/CDPP-AMDA/Interball-Tail.xml
+++ b/Observatory/CDPP-AMDA/Interball-Tail.xml
@@ -8,7 +8,7 @@
       <ReleaseDate>2010-09-27T18:40:58Z</ReleaseDate>
        <Description></Description>     
       <Contact>
-        <PersonID>spase://CNES/Person/Lev.Zeleny</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Lev.Zeleny</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>
     </ResourceHeader>
diff --git a/Observatory/CDPP-AMDA/Interball.xml b/Observatory/CDPP-AMDA/Interball.xml
index d74e128..f8249c6 100644
--- a/Observatory/CDPP-AMDA/Interball.xml
+++ b/Observatory/CDPP-AMDA/Interball.xml
@@ -15,7 +15,7 @@
         The second pair, Auroral Probe and S2-A (A for "Auroral"), had an orbit that crossed the auroral oval to observe the acceleration of 
         auroral particles and the flow of electric currents that connect the magnetospheric tail with the conducting ionosphere.</Description>
       <Contact>
-        <PersonID>spase://CNES/Person/Lev.Zeleny</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Lev.Zeleny</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>
     </ResourceHeader>
diff --git a/Observatory/CDPP-AMDA/Juice.xml b/Observatory/CDPP-AMDA/Juice.xml
index 28de517..701a41e 100644
--- a/Observatory/CDPP-AMDA/Juice.xml
+++ b/Observatory/CDPP-AMDA/Juice.xml
@@ -11,7 +11,7 @@
         Planned for launch in May 2022 and arrival at Jupiter in October 2029, it will spend at least three years making detailed 
         observations of the giant gaseous planet Jupiter and three of its largest moons, Ganymede, Callisto and Europa</Description>
       <Contact>     
-        <PersonID>spase://CNES/Person/Olivier.Witasse</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Olivier.Witasse</PersonID>
         <Role>ProjectScientist</Role>
       </Contact>      
     </ResourceHeader>
diff --git a/Observatory/CDPP-AMDA/Juno.xml b/Observatory/CDPP-AMDA/Juno.xml
index 68d1de6..47b9834 100644
--- a/Observatory/CDPP-AMDA/Juno.xml
+++ b/Observatory/CDPP-AMDA/Juno.xml
@@ -17,7 +17,7 @@ Specifically, Juno will…
    * Explore and study Jupiter's magnetosphere near the planet's poles, especially the auroras – Jupiter's northern and southern lights – providing new insights about how the planet's enormous magnetic force field affects its atmosphere.
     </Description>
       <Contact>     
-        <PersonID>spase://CNES/Person/Scott.Bolton</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Scott.Bolton</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>      
     </ResourceHeader>
diff --git a/Observatory/CDPP-AMDA/MAVEN.xml b/Observatory/CDPP-AMDA/MAVEN.xml
index 0e56bff..137f1fb 100644
--- a/Observatory/CDPP-AMDA/MAVEN.xml
+++ b/Observatory/CDPP-AMDA/MAVEN.xml
@@ -12,7 +12,7 @@
       </Description>
       <Acknowledgement>NASA</Acknowledgement>
       <Contact>     
-        <PersonID>spase://CNES/Person/Bruce.M.Jakosky</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Bruce.M.Jakosky</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact>  
       <InformationURL> 
diff --git a/Observatory/CDPP-AMDA/MEX.xml b/Observatory/CDPP-AMDA/MEX.xml
index 4274747..0d2d86e 100644
--- a/Observatory/CDPP-AMDA/MEX.xml
+++ b/Observatory/CDPP-AMDA/MEX.xml
@@ -14,11 +14,11 @@
         and the Mars 96 mission. Since beginning science operations in 2004, the durable orbiter has given scientists an entirely new view of Earth's intriguing neighbour, and is helping to answer fundamental questions about the geology, 
         atmosphere, surface environment, history of water and potential for life on Mars.</Description>      
       <Contact>     
-        <PersonID>spase://CNES/Person/D.Titov</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/D.Titov</PersonID>
         <Role>ProjectScientist</Role>
       </Contact>
       <Contact>     
-        <PersonID>spase://CNES/Person/A.Chicarro</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/A.Chicarro</PersonID>
         <Role>ProjectScientist</Role>
       </Contact>
       <InformationURL> 
diff --git a/Observatory/CDPP-AMDA/Mariner10.xml b/Observatory/CDPP-AMDA/Mariner10.xml
index 529e8a7..6b0afa6 100644
--- a/Observatory/CDPP-AMDA/Mariner10.xml
+++ b/Observatory/CDPP-AMDA/Mariner10.xml
@@ -13,7 +13,7 @@
                 orbit and returned images and data on the planet. 
 </Description>
             <Contact>
-                <PersonID>spase://CNES/Person/Stephen.E.Dwornik</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Stephen.E.Dwornik</PersonID>
                 <Role>Scientist</Role>
 </Contact>
             <InformationURL>
diff --git a/Observatory/CDPP-AMDA/POLAR.xml b/Observatory/CDPP-AMDA/POLAR.xml
index cb05321..1d448bf 100644
--- a/Observatory/CDPP-AMDA/POLAR.xml
+++ b/Observatory/CDPP-AMDA/POLAR.xml
@@ -17,7 +17,7 @@
         <Role>ProjectScientist</Role>        
       </Contact>
       <Contact>
-        <PersonID>spase://CNES/Person/John.B.Sigwarth</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/John.B.Sigwarth</PersonID>
         <Role>ProjectScientist</Role>
       </Contact>
       <InformationURL>
diff --git a/Observatory/CDPP-AMDA/Pioneer.xml b/Observatory/CDPP-AMDA/Pioneer.xml
index 12dbcc9..d8cdf0a 100644
--- a/Observatory/CDPP-AMDA/Pioneer.xml
+++ b/Observatory/CDPP-AMDA/Pioneer.xml
@@ -19,7 +19,7 @@
 * The Pioneer Venus Multiprobe spacecraft was launched on 8 August 1978. Three small probes, one large probe, and the spacecraft bus entered the Venus atmosphere on 9 December 1978.
  </Description>
       <Contact>
-        <PersonID>spase://CNES/Person/Charles.Hall</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Charles.Hall</PersonID>
         <Role>ProjectManager</Role>
       </Contact>
       <Contact>
diff --git a/Observatory/CDPP-AMDA/Rosetta.xml b/Observatory/CDPP-AMDA/Rosetta.xml
index e5dc5e7..e49f3dc 100644
--- a/Observatory/CDPP-AMDA/Rosetta.xml
+++ b/Observatory/CDPP-AMDA/Rosetta.xml
@@ -10,7 +10,7 @@
       <Description>Rosetta launched in 2004 and arrived at Comet 67P/Churyumov-Gerasimenko on 6 August 2014. It is the first mission in history to rendezvous with a comet, escort it as it orbits the Sun, and deploy a lander to its surface. Rosetta is an ESA mission with contributions from its member states and NASA. Rosetta's Philae lander is provided by a consortium led by DLR, MPS, CNES and ASI. The mission ended on 30 September 2016.</Description>
       <Acknowledgement>ESA, NASA</Acknowledgement>
       <Contact>     
-        <PersonID>spase://CNES/Person/Matt.Taylor</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Matt.Taylor</PersonID>
         <Role>ProjectScientist</Role>
       </Contact>
       <InformationURL> 
diff --git a/Observatory/CDPP-AMDA/SWARM-A.xml b/Observatory/CDPP-AMDA/SWARM-A.xml
index 673e259..8792545 100644
--- a/Observatory/CDPP-AMDA/SWARM-A.xml
+++ b/Observatory/CDPP-AMDA/SWARM-A.xml
@@ -10,11 +10,11 @@
       <Description/>
       <Acknowledgement/>
        <Contact>
-        <PersonID>spase://CNES/Person/R.Floberghagen</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/R.Floberghagen</PersonID>
         <Role>MissionManager</Role>
        </Contact>
       <Contact>
-         <PersonID>spase://CNES/Person/R.Haagmans</PersonID>
+         <PersonID>spase://CNES/Person/CDPP-AMDA/R.Haagmans</PersonID>
         <Role>ProjectScientist</Role> 
       </Contact>
       <InformationURL>
diff --git a/Observatory/CDPP-AMDA/SWARM-B.xml b/Observatory/CDPP-AMDA/SWARM-B.xml
index ce73a38..7897b6b 100644
--- a/Observatory/CDPP-AMDA/SWARM-B.xml
+++ b/Observatory/CDPP-AMDA/SWARM-B.xml
@@ -10,11 +10,11 @@
       <Description/>
       <Acknowledgement/>
        <Contact>
-        <PersonID>spase://CNES/Person/R.Floberghagen</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/R.Floberghagen</PersonID>
         <Role>MissionManager</Role>
        </Contact>
       <Contact>
-        <PersonID>spase://CNES/Person/R.Haagmans</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/R.Haagmans</PersonID>
         <Role>ProjectScientist</Role>
       </Contact>
       <InformationURL>
diff --git a/Observatory/CDPP-AMDA/SWARM-C.xml b/Observatory/CDPP-AMDA/SWARM-C.xml
index a137ebc..2ae397a 100644
--- a/Observatory/CDPP-AMDA/SWARM-C.xml
+++ b/Observatory/CDPP-AMDA/SWARM-C.xml
@@ -10,11 +10,11 @@
       <Description/>
       <Acknowledgement/>
        <Contact>
-        <PersonID>spase://CNES/Person/R.Floberghagen</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/R.Floberghagen</PersonID>
         <Role>MissionManager</Role>
        </Contact>
         <Contact>
-        <PersonID>spase://CNES/Person/R.Haagmans</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/R.Haagmans</PersonID>
         <Role>ProjectScientist</Role>
       </Contact>
       <InformationURL>
diff --git a/Observatory/CDPP-AMDA/SWARM.xml b/Observatory/CDPP-AMDA/SWARM.xml
index 4dd670a..738c7fa 100644
--- a/Observatory/CDPP-AMDA/SWARM.xml
+++ b/Observatory/CDPP-AMDA/SWARM.xml
@@ -19,11 +19,11 @@ field and its temporal evolution as well as the electric field in the atmosphere
        </Description>
       <Acknowledgement/> 
       <Contact>
-        <PersonID>spase://CNES/Person/R.Floberghagen</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/R.Floberghagen</PersonID>
         <Role>MissionManager</Role>
       </Contact>
       <Contact>
-        <PersonID>spase://CNES/Person/R.Haagmans</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/R.Haagmans</PersonID>
         <Role>ProjectScientist</Role>
       </Contact>
       <InformationURL>
diff --git a/Observatory/CDPP-AMDA/SolO.xml b/Observatory/CDPP-AMDA/SolO.xml
index d941ec2..264b469 100644
--- a/Observatory/CDPP-AMDA/SolO.xml
+++ b/Observatory/CDPP-AMDA/SolO.xml
@@ -10,7 +10,7 @@
       <Description> Solar Orbiter is a Sun-observing satellite, under development by the European Space Agency. The mission was launched with an Atlas 
         V from the Cape Canaveral AFS in Florida on 09 February 2020.</Description>
       <Contact>     
-        <PersonID>spase://CNES/Person/Daniel.Muller</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Daniel.Muller</PersonID>
         <Role>ProjectScientist</Role>
       </Contact> 
       <InformationURL>
diff --git a/Observatory/CDPP-AMDA/Solar.xml b/Observatory/CDPP-AMDA/Solar.xml
index 7503716..e5a61f2 100644
--- a/Observatory/CDPP-AMDA/Solar.xml
+++ b/Observatory/CDPP-AMDA/Solar.xml
@@ -12,7 +12,7 @@
       * Gamma - Fermi / LAT
       </Description> 
        <Contact>       
-        <PersonID>spase://CNES/Person/T.Woods</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/T.Woods</PersonID>
         <Role>PrincipalInvestigator</Role>
       </Contact> 
         <InformationURL>
diff --git a/Observatory/CDPP-AMDA/TIMED.xml b/Observatory/CDPP-AMDA/TIMED.xml
index ef65d9b..a711b10 100644
--- a/Observatory/CDPP-AMDA/TIMED.xml
+++ b/Observatory/CDPP-AMDA/TIMED.xml
@@ -14,7 +14,7 @@
         deposited into Earth's environment. TIMED is focusing on a portion of this atmospheric region located approximately 
         40-110 miles (60-180 kilometers) above the surface.</Description>
       <Contact>     
-        <PersonID>spase://CNES/Person/Diego.Janches</PersonID>
+        <PersonID>spase://CNES/Person/CDPP-AMDA/Diego.Janches</PersonID>
         <Role>ProjectScientist</Role>
       </Contact>
       <InformationURL>
diff --git a/Observatory/CDPP-AMDA/Wind.xml b/Observatory/CDPP-AMDA/Wind.xml
index b8eaa35..0788b34 100644
--- a/Observatory/CDPP-AMDA/Wind.xml
+++ b/Observatory/CDPP-AMDA/Wind.xml
@@ -16,7 +16,7 @@ White background, dark cylinder 1/6th the size of the frame, WIND spacecraft. a 
    * Provide baseline, 1 AU, ecliptic plane observations for inner and outer heliospheric missions.
  </Description>
       <Contact>      
-         <PersonID>spase://CNES/Person/Lynn.B.Wilson</PersonID>
+         <PersonID>spase://CNES/Person/CDPP-AMDA/Lynn.B.Wilson</PersonID>
         <Role>ProjectScientist</Role>
       </Contact>
       <InformationURL>
diff --git a/SimulationModel/CDPP-AMDA/Ballistic.xml b/SimulationModel/CDPP-AMDA/Ballistic.xml
index 6f039b7..1613184 100644
--- a/SimulationModel/CDPP-AMDA/Ballistic.xml
+++ b/SimulationModel/CDPP-AMDA/Ballistic.xml
@@ -8,7 +8,7 @@
             <ReleaseDate>2014-07-08T14:48:29Z</ReleaseDate>
             <Description/>
             <Contact>
-                <PersonID>spase://CNES/Person/Vincent.Genot</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Vincent.Genot</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
            <Association>
diff --git a/SimulationModel/CDPP-AMDA/Cain.xml b/SimulationModel/CDPP-AMDA/Cain.xml
index 917a68b..0f0e208 100644
--- a/SimulationModel/CDPP-AMDA/Cain.xml
+++ b/SimulationModel/CDPP-AMDA/Cain.xml
@@ -9,7 +9,7 @@
             <ReleaseDate>2017-02-08T14:48:29Z</ReleaseDate>
             <Description>Spherical Harmonic</Description>
             <Contact>
-                <PersonID>spase://CNES/Person/Joseph.C.Cain</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Joseph.C.Cain</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
            <Association>
diff --git a/SimulationModel/CDPP-AMDA/JRM09.xml b/SimulationModel/CDPP-AMDA/JRM09.xml
index ad3a670..bd3c3e4 100644
--- a/SimulationModel/CDPP-AMDA/JRM09.xml
+++ b/SimulationModel/CDPP-AMDA/JRM09.xml
@@ -9,7 +9,7 @@
             <ReleaseDate>2020-01-08T14:48:29Z</ReleaseDate>
             <Description>Spherical Harmonic</Description>
             <Contact>
-                <PersonID>spase://CNES/Person/Connerney</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Connerney</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
            <Association>
diff --git a/SimulationModel/CDPP-AMDA/Morschhauser.xml b/SimulationModel/CDPP-AMDA/Morschhauser.xml
index 8c8c69b..728bcf2 100644
--- a/SimulationModel/CDPP-AMDA/Morschhauser.xml
+++ b/SimulationModel/CDPP-AMDA/Morschhauser.xml
@@ -9,7 +9,7 @@
             <ReleaseDate>2017-01-08T14:48:29Z</ReleaseDate>
             <Description>Spherical Harmonic</Description>
             <Contact>
-                <PersonID>spase://CNES/Person/A.Morschhauser</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/A.Morschhauser</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
            <Association>
diff --git a/SimulationModel/CDPP-AMDA/Tao.xml b/SimulationModel/CDPP-AMDA/Tao.xml
index 920cdf0..7a647d9 100644
--- a/SimulationModel/CDPP-AMDA/Tao.xml
+++ b/SimulationModel/CDPP-AMDA/Tao.xml
@@ -8,7 +8,7 @@
             <ReleaseDate>2014-07-08T14:48:29Z</ReleaseDate>
             <Description>1D MHD Model. The model code is based on the Coordinated Astronomical Numerical Software (CANS) by JSTModel details, evaluations compared with observation data, and limitations are described in Tao et al. 2005, J. Geophys. Res., 110, A11208, doi:10.1029/2004JA010959</Description>
             <Contact>
-                <PersonID>spase://CNES/Person/Chihiro.Tao</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Chihiro.Tao</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
            <Association>
diff --git a/SimulationModel/CDPP-AMDA/Tsyganenko96.xml b/SimulationModel/CDPP-AMDA/Tsyganenko96.xml
index 5477360..c3940a0 100644
--- a/SimulationModel/CDPP-AMDA/Tsyganenko96.xml
+++ b/SimulationModel/CDPP-AMDA/Tsyganenko96.xml
@@ -9,7 +9,7 @@
             <ReleaseDate>2017-07-08T14:48:29Z</ReleaseDate>
             <Description>The data-based approach to the modeling of the geomagnetosphere has been developed over the last 3 decades, starting with the pioneering work by Mead and Fairfield [1975]. Subsequent efforts [Tsyganenko and Usmanov, 1982; Tsyganenko, 1987, 1989, 1996, 2002, 2003, Tsyganenko and Sitnov, 2005] resulted in more refined models, used since then in many studies. The principal goal of the data-based magnetosphere modeling is to extract full information from large sets of available data , bridge the gap between theory and observations.</Description>
              <Contact>
-                <PersonID>spase://CNES/Person/Nikolai.Tsyganenko</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Nikolai.Tsyganenko</PersonID>
                 <Role>PrincipalInvestigator</Role>
               </Contact>
            <Association>
diff --git a/SimulationRun/CDPP-AMDA/BALLISTIC/Bepi.xml b/SimulationRun/CDPP-AMDA/BALLISTIC/Bepi.xml
index 52fad67..ebdaff4 100644
--- a/SimulationRun/CDPP-AMDA/BALLISTIC/Bepi.xml
+++ b/SimulationRun/CDPP-AMDA/BALLISTIC/Bepi.xml
@@ -9,7 +9,7 @@
             <ReleaseDate>2020-04-29T14:48:29Z</ReleaseDate>
             <Description/>  
             <Contact>
-                <PersonID>spase://CNES/Person/Vincent.Genot</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Vincent.Genot</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>           
         </ResourceHeader>
diff --git a/SimulationRun/CDPP-AMDA/BALLISTIC/Jupiter.xml b/SimulationRun/CDPP-AMDA/BALLISTIC/Jupiter.xml
index 528c748..213d924 100644
--- a/SimulationRun/CDPP-AMDA/BALLISTIC/Jupiter.xml
+++ b/SimulationRun/CDPP-AMDA/BALLISTIC/Jupiter.xml
@@ -9,7 +9,7 @@
             <ReleaseDate>2018-07-08T14:48:29Z</ReleaseDate>
             <Description/>  
             <Contact>
-                <PersonID>spase://CNES/Person/Vincent.Genot</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Vincent.Genot</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>           
         </ResourceHeader>
diff --git a/SimulationRun/CDPP-AMDA/BALLISTIC/Mars.xml b/SimulationRun/CDPP-AMDA/BALLISTIC/Mars.xml
index 10183f8..278d06c 100644
--- a/SimulationRun/CDPP-AMDA/BALLISTIC/Mars.xml
+++ b/SimulationRun/CDPP-AMDA/BALLISTIC/Mars.xml
@@ -9,7 +9,7 @@
             <ReleaseDate>2018-07-08T14:48:29Z</ReleaseDate>
             <Description/>  
             <Contact>
-                <PersonID>spase://CNES/Person/Vincent.Genot</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Vincent.Genot</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>           
         </ResourceHeader>
diff --git a/SimulationRun/CDPP-AMDA/BALLISTIC/Mercury.xml b/SimulationRun/CDPP-AMDA/BALLISTIC/Mercury.xml
index de27987..33d4edc 100644
--- a/SimulationRun/CDPP-AMDA/BALLISTIC/Mercury.xml
+++ b/SimulationRun/CDPP-AMDA/BALLISTIC/Mercury.xml
@@ -9,7 +9,7 @@
             <ReleaseDate>2020-04-29T14:48:29Z</ReleaseDate>
             <Description/>  
             <Contact>
-                <PersonID>spase://CNES/Person/Vincent.Genot</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Vincent.Genot</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>           
         </ResourceHeader>
diff --git a/SimulationRun/CDPP-AMDA/BALLISTIC/Neptune.xml b/SimulationRun/CDPP-AMDA/BALLISTIC/Neptune.xml
index 891003f..190017b 100644
--- a/SimulationRun/CDPP-AMDA/BALLISTIC/Neptune.xml
+++ b/SimulationRun/CDPP-AMDA/BALLISTIC/Neptune.xml
@@ -9,7 +9,7 @@
             <ReleaseDate>2020-04-29T14:48:29Z</ReleaseDate>
             <Description/>  
             <Contact>
-                <PersonID>spase://CNES/Person/Vincent.Genot</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Vincent.Genot</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>           
         </ResourceHeader>
diff --git a/SimulationRun/CDPP-AMDA/BALLISTIC/Psp.xml b/SimulationRun/CDPP-AMDA/BALLISTIC/Psp.xml
index 85bd4fb..31a6fe3 100644
--- a/SimulationRun/CDPP-AMDA/BALLISTIC/Psp.xml
+++ b/SimulationRun/CDPP-AMDA/BALLISTIC/Psp.xml
@@ -9,7 +9,7 @@
             <ReleaseDate>2020-04-29T14:48:29Z</ReleaseDate>
             <Description/>  
             <Contact>
-                <PersonID>spase://CNES/Person/Vincent.Genot</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Vincent.Genot</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>           
         </ResourceHeader>
diff --git a/SimulationRun/CDPP-AMDA/BALLISTIC/Rosetta.xml b/SimulationRun/CDPP-AMDA/BALLISTIC/Rosetta.xml
index c31980c..5e6b0d4 100644
--- a/SimulationRun/CDPP-AMDA/BALLISTIC/Rosetta.xml
+++ b/SimulationRun/CDPP-AMDA/BALLISTIC/Rosetta.xml
@@ -9,7 +9,7 @@
             <ReleaseDate>2020-04-29T14:48:29Z</ReleaseDate>
             <Description/>  
             <Contact>
-                <PersonID>spase://CNES/Person/Vincent.Genot</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Vincent.Genot</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>           
         </ResourceHeader>
diff --git a/SimulationRun/CDPP-AMDA/BALLISTIC/Saturn.xml b/SimulationRun/CDPP-AMDA/BALLISTIC/Saturn.xml
index 3faa161..a29031a 100644
--- a/SimulationRun/CDPP-AMDA/BALLISTIC/Saturn.xml
+++ b/SimulationRun/CDPP-AMDA/BALLISTIC/Saturn.xml
@@ -9,7 +9,7 @@
             <ReleaseDate>2018-07-08T14:48:29Z</ReleaseDate>
             <Description/>  
             <Contact>
-                <PersonID>spase://CNES/Person/Vincent.Genot</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Vincent.Genot</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>           
         </ResourceHeader>
diff --git a/SimulationRun/CDPP-AMDA/BALLISTIC/SolO.xml b/SimulationRun/CDPP-AMDA/BALLISTIC/SolO.xml
index d94e930..36b8156 100644
--- a/SimulationRun/CDPP-AMDA/BALLISTIC/SolO.xml
+++ b/SimulationRun/CDPP-AMDA/BALLISTIC/SolO.xml
@@ -9,7 +9,7 @@
             <ReleaseDate>2018-07-08T14:48:29Z</ReleaseDate>
             <Description/>  
             <Contact>
-                <PersonID>spase://CNES/Person/Vincent.Genot</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Vincent.Genot</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>           
         </ResourceHeader>
diff --git a/SimulationRun/CDPP-AMDA/BALLISTIC/Uranus.xml b/SimulationRun/CDPP-AMDA/BALLISTIC/Uranus.xml
index cd3c9b1..3e917b7 100644
--- a/SimulationRun/CDPP-AMDA/BALLISTIC/Uranus.xml
+++ b/SimulationRun/CDPP-AMDA/BALLISTIC/Uranus.xml
@@ -9,7 +9,7 @@
             <ReleaseDate>2020-04-29T14:48:29Z</ReleaseDate>
             <Description/>  
             <Contact>
-                <PersonID>spase://CNES/Person/Vincent.Genot</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Vincent.Genot</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>           
         </ResourceHeader>
diff --git a/SimulationRun/CDPP-AMDA/BALLISTIC/Venus.xml b/SimulationRun/CDPP-AMDA/BALLISTIC/Venus.xml
index 582f75a..0464b62 100644
--- a/SimulationRun/CDPP-AMDA/BALLISTIC/Venus.xml
+++ b/SimulationRun/CDPP-AMDA/BALLISTIC/Venus.xml
@@ -9,7 +9,7 @@
             <ReleaseDate>2020-04-29T14:48:29Z</ReleaseDate>
             <Description/>  
             <Contact>
-                <PersonID>spase://CNES/Person/Vincent.Genot</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Vincent.Genot</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>           
         </ResourceHeader>
diff --git a/SimulationRun/CDPP-AMDA/CAIN/CainRun.xml b/SimulationRun/CDPP-AMDA/CAIN/CainRun.xml
index db959ab..3e559bb 100644
--- a/SimulationRun/CDPP-AMDA/CAIN/CainRun.xml
+++ b/SimulationRun/CDPP-AMDA/CAIN/CainRun.xml
@@ -31,11 +31,11 @@ agreement with the field representations at MPO altitudes, but disagreements up 
 INhundred nT in components calculated for areodetic altitudes below 200 km.
 </Description> 
             <Contact>
-                <PersonID>spase://CNES/Person/Joseph.C.Cain</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Joseph.C.Cain</PersonID>
                 <Role>PrincipalInvestigator</Role>
               </Contact>  
              <Contact>
-                <PersonID>spase://CNES/Person/Elena.Budnik</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Elena.Budnik</PersonID>
                 <Role>TechnicalContact</Role>
             </Contact>
         </ResourceHeader>
diff --git a/SimulationRun/CDPP-AMDA/JRM09/JRM09Run.xml b/SimulationRun/CDPP-AMDA/JRM09/JRM09Run.xml
index e9c0c62..3160d27 100644
--- a/SimulationRun/CDPP-AMDA/JRM09/JRM09Run.xml
+++ b/SimulationRun/CDPP-AMDA/JRM09/JRM09Run.xml
@@ -16,7 +16,7 @@
                 (Juno Reference Model through Perijove 9) of the planetary magnetic field with spherical harmonic coefficients well determined through 
                 degree and order 10, providing the first detailed view of a planetary dynamo beyond Earth.</Description>               
             <Contact>
-                <PersonID>spase://CNES/Person/Connerney</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Connerney</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>             
         </ResourceHeader>
diff --git a/SimulationRun/CDPP-AMDA/MORSCHHAUSER/MorschhauserRun.xml b/SimulationRun/CDPP-AMDA/MORSCHHAUSER/MorschhauserRun.xml
index 27550db..f842103 100644
--- a/SimulationRun/CDPP-AMDA/MORSCHHAUSER/MorschhauserRun.xml
+++ b/SimulationRun/CDPP-AMDA/MORSCHHAUSER/MorschhauserRun.xml
@@ -9,11 +9,11 @@
             <ReleaseDate>2017-03-08T14:48:29Z</ReleaseDate>
             <Description>Model of the lithospheric magnetic field of Mars  is based on Mars Global Surveyor orbiting satellite data and represented by an expansion of spherical harmonic (SH) functions up to degree and order 110. Several techniques were applied in order to obtain a reliable and well-resolved model of the Martian lithospheric magnetic field: A modified Huber-Norm was used to properly treat data outliers, the mapping phase orbit data was weighted based on an a priori analysis of the data, and static external fields were treated by a joint inversion of external and internal fields. Further, temporal variabilities in the data which lead to unrealistically strong anomalies were considered as noise and handled by additionally minimizing a measure of the horizontal gradient of the vertically down internal field component at surface altitude. Here we use an iteratively reweighted least squares algorithm to approach an absolute measure (L1 norm), allowing for a better representation of strong localized magnetic anomalies as compared to the conventional least squares measure (L2 norm). The resulting model reproduces all known characteristics of the Martian lithospheric field and shows a rich level of detail. It is characterized by a low level of noise and robust when downward continued to the surface. We show how these properties can help to improve the knowledge of the Martian past and present magnetic field by investigating magnetic signatures associated with impacts and volcanoes. Additionally, we present some previously undescribed isolated anomalies, which can be used to determine paleopole positions and magnetization strengths.</Description> 
             <Contact>
-                <PersonID>spase://CNES/Person/A.Morschhauser</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/A.Morschhauser</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>
             <Contact>
-                <PersonID>spase://CNES/Person/A.Beth</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/A.Beth</PersonID>
                 <Role>TechnicalContact</Role>
             </Contact>
         </ResourceHeader>
diff --git a/SimulationRun/CDPP-AMDA/TAO/Bepi.xml b/SimulationRun/CDPP-AMDA/TAO/Bepi.xml
index 1e68008..febbc2e 100644
--- a/SimulationRun/CDPP-AMDA/TAO/Bepi.xml
+++ b/SimulationRun/CDPP-AMDA/TAO/Bepi.xml
@@ -14,7 +14,7 @@
 		   
 		    br = bepi_input_b*bepi_input_v(0)*1000./(2*pi/25.38/86400)/(2.5*Rsun-r_bepi*AU)</Description> 
             <Contact>
-                <PersonID>spase://CNES/Person/Chihiro.Tao</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Chihiro.Tao</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>           
         </ResourceHeader>
diff --git a/SimulationRun/CDPP-AMDA/TAO/Cassini.xml b/SimulationRun/CDPP-AMDA/TAO/Cassini.xml
index cfde6d1..8c52b81 100644
--- a/SimulationRun/CDPP-AMDA/TAO/Cassini.xml
+++ b/SimulationRun/CDPP-AMDA/TAO/Cassini.xml
@@ -14,7 +14,7 @@
 		    
 		    br = cass_input_b*cass_input_v(0)*1000./(2*pi/25.38/86400)/(2.5*Rsun-r_cass*AU)</Description> 
             <Contact>
-                <PersonID>spase://CNES/Person/Chihiro.Tao</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Chihiro.Tao</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>           
         </ResourceHeader>
diff --git a/SimulationRun/CDPP-AMDA/TAO/Juno.xml b/SimulationRun/CDPP-AMDA/TAO/Juno.xml
index 5762af3..f43220d 100644
--- a/SimulationRun/CDPP-AMDA/TAO/Juno.xml
+++ b/SimulationRun/CDPP-AMDA/TAO/Juno.xml
@@ -14,7 +14,7 @@ The radial magnetic field along parker spirals is computed using :
 		    
 		    br = juno_input_b*juno_input_v(0)*1000./(2*pi/25.38/86400)/(2.5*Rsun-r_juno*AU)</Description> 
             <Contact>
-                <PersonID>spase://CNES/Person/Chihiro.Tao</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Chihiro.Tao</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>           
         </ResourceHeader>
diff --git a/SimulationRun/CDPP-AMDA/TAO/Jupiter.xml b/SimulationRun/CDPP-AMDA/TAO/Jupiter.xml
index 45c9112..1a11681 100644
--- a/SimulationRun/CDPP-AMDA/TAO/Jupiter.xml
+++ b/SimulationRun/CDPP-AMDA/TAO/Jupiter.xml
@@ -14,7 +14,7 @@
 
 		    br = jup_input_b*jup_input_v(0)*1000./(2*pi/25.38/86400)/(2.5*Rsun-r_jup*AU)</Description> 
             <Contact>
-                <PersonID>spase://CNES/Person/Chihiro.Tao</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Chihiro.Tao</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>           
         </ResourceHeader>
diff --git a/SimulationRun/CDPP-AMDA/TAO/Mars.xml b/SimulationRun/CDPP-AMDA/TAO/Mars.xml
index ea8c015..36dfa1c 100644
--- a/SimulationRun/CDPP-AMDA/TAO/Mars.xml
+++ b/SimulationRun/CDPP-AMDA/TAO/Mars.xml
@@ -14,7 +14,7 @@
 	
 		    br = mars_input_b*mars_input_v(0)*1000./(2*pi/25.38/86400)/(2.5*Rsun-r_mars*AU)</Description> 
             <Contact>
-                <PersonID>spase://CNES/Person/Chihiro.Tao</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Chihiro.Tao</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>           
         </ResourceHeader>
diff --git a/SimulationRun/CDPP-AMDA/TAO/Mercury.xml b/SimulationRun/CDPP-AMDA/TAO/Mercury.xml
index dcffed6..0531a71 100644
--- a/SimulationRun/CDPP-AMDA/TAO/Mercury.xml
+++ b/SimulationRun/CDPP-AMDA/TAO/Mercury.xml
@@ -14,7 +14,7 @@
 		    
 		    br = mercury_input_b*mercury_input_v(0)*1000./(2*pi/25.38/86400)/(2.5*Rsun-r_mercury*AU)</Description> 
             <Contact>
-                <PersonID>spase://CNES/Person/Chihiro.Tao</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Chihiro.Tao</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>           
         </ResourceHeader>
diff --git a/SimulationRun/CDPP-AMDA/TAO/Neptune.xml b/SimulationRun/CDPP-AMDA/TAO/Neptune.xml
index 9442b6d..a988b25 100644
--- a/SimulationRun/CDPP-AMDA/TAO/Neptune.xml
+++ b/SimulationRun/CDPP-AMDA/TAO/Neptune.xml
@@ -14,7 +14,7 @@
 
 		    br = nep_input_b*nep_input_v(0)*1000./(2*pi/25.38/86400)/(2.5*Rsun-r_nep*AU)</Description> 
             <Contact>
-                <PersonID>spase://CNES/Person/Chihiro.Tao</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Chihiro.Tao</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>           
         </ResourceHeader>
diff --git a/SimulationRun/CDPP-AMDA/TAO/Psp.xml b/SimulationRun/CDPP-AMDA/TAO/Psp.xml
index 4ee72df..285c3da 100644
--- a/SimulationRun/CDPP-AMDA/TAO/Psp.xml
+++ b/SimulationRun/CDPP-AMDA/TAO/Psp.xml
@@ -14,7 +14,7 @@
 
 		    br = psp_input_b*psp_input_v(0)*1000./(2*pi/25.38/86400)/(2.5*Rsun-r_psp*AU)</Description> 
             <Contact>
-                <PersonID>spase://CNES/Person/Chihiro.Tao</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Chihiro.Tao</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>           
         </ResourceHeader>
diff --git a/SimulationRun/CDPP-AMDA/TAO/Rosetta.xml b/SimulationRun/CDPP-AMDA/TAO/Rosetta.xml
index 36ec354..c056f90 100644
--- a/SimulationRun/CDPP-AMDA/TAO/Rosetta.xml
+++ b/SimulationRun/CDPP-AMDA/TAO/Rosetta.xml
@@ -14,7 +14,7 @@
 
 		    br = ros_input_b*ros_input_v(0)*1000./(2*pi/25.38/86400)/(2.5*Rsun-r_ros*AU)</Description> 
             <Contact>
-                <PersonID>spase://CNES/Person/Chihiro.Tao</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Chihiro.Tao</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>           
         </ResourceHeader>
diff --git a/SimulationRun/CDPP-AMDA/TAO/Saturn.xml b/SimulationRun/CDPP-AMDA/TAO/Saturn.xml
index 837c188..0c77727 100644
--- a/SimulationRun/CDPP-AMDA/TAO/Saturn.xml
+++ b/SimulationRun/CDPP-AMDA/TAO/Saturn.xml
@@ -14,7 +14,7 @@
 
             br = sat_input_b*sat_input_v(0)*1000./(2*pi/25.38/86400)/(2.5*Rsun-r_sat*AU)</Description> 
             <Contact>
-                <PersonID>spase://CNES/Person/Chihiro.Tao</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Chihiro.Tao</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>           
         </ResourceHeader>
diff --git a/SimulationRun/CDPP-AMDA/TAO/So.xml b/SimulationRun/CDPP-AMDA/TAO/So.xml
index d709ed2..8faed80 100644
--- a/SimulationRun/CDPP-AMDA/TAO/So.xml
+++ b/SimulationRun/CDPP-AMDA/TAO/So.xml
@@ -14,7 +14,7 @@
 
             br = so_input_b*so_input_v(0)*1000./(2*pi/25.38/86400)/(2.5*Rsun-r_so*AU)</Description> 
             <Contact>
-                <PersonID>spase://CNES/Person/Chihiro.Tao</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Chihiro.Tao</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>           
         </ResourceHeader>
diff --git a/SimulationRun/CDPP-AMDA/TAO/Uranus.xml b/SimulationRun/CDPP-AMDA/TAO/Uranus.xml
index 696724a..ee9c692 100644
--- a/SimulationRun/CDPP-AMDA/TAO/Uranus.xml
+++ b/SimulationRun/CDPP-AMDA/TAO/Uranus.xml
@@ -14,7 +14,7 @@
 
 		    br = ura_input_b*ura_input_v(0)*1000./(2*pi/25.38/86400)/(2.5*Rsun-r_ura*AU)</Description> 
             <Contact>
-                <PersonID>spase://CNES/Person/Chihiro.Tao</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Chihiro.Tao</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>           
         </ResourceHeader>
diff --git a/SimulationRun/CDPP-AMDA/TAO/Venus.xml b/SimulationRun/CDPP-AMDA/TAO/Venus.xml
index b22bc97..80fac83 100644
--- a/SimulationRun/CDPP-AMDA/TAO/Venus.xml
+++ b/SimulationRun/CDPP-AMDA/TAO/Venus.xml
@@ -14,7 +14,7 @@
 
 		    br = venus_input_b*venus_input_v(0)*1000./(2*pi/25.38/86400)/(2.5*Rsun-r_venus*AU)</Description> 
             <Contact>
-                <PersonID>spase://CNES/Person/Chihiro.Tao</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Chihiro.Tao</PersonID>
                 <Role>PrincipalInvestigator</Role>
             </Contact>           
         </ResourceHeader>
diff --git a/SimulationRun/CDPP-AMDA/TSYG96/Tsyg96Run.xml b/SimulationRun/CDPP-AMDA/TSYG96/Tsyg96Run.xml
index 8b8b220..e1c1e39 100644
--- a/SimulationRun/CDPP-AMDA/TSYG96/Tsyg96Run.xml
+++ b/SimulationRun/CDPP-AMDA/TSYG96/Tsyg96Run.xml
@@ -8,11 +8,11 @@
             <ReleaseDate>2016-08-22T00:00:00Z</ReleaseDate>
             <Description>A data-based Tsyganenko96 model computes the geomagnetospheric magnetic field with an explicitly defined realistic magnetopause, large-scale Region 1 and 2 Birkeland current systems, and the IMF penetration across the boundary.</Description> 
             <Contact>
-                <PersonID>spase://CNES/Person/Nikolai.Tsyganenko</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Nikolai.Tsyganenko</PersonID>
                 <Role>PrincipalInvestigator</Role>
               </Contact>  
              <Contact>
-                <PersonID>spase://CNES/Person/Elena.Budnik</PersonID>
+                <PersonID>spase://CNES/Person/CDPP-AMDA/Elena.Budnik</PersonID>
                 <Role>TechnicalContact</Role>
             </Contact>
         </ResourceHeader>
--
libgit2 0.21.2