diff --git a/Instrument/AMDA/Pioneer10/GTT.xml b/Instrument/AMDA/Pioneer10/GTT.xml
index ae62d0a..d0d3da3 100644
--- a/Instrument/AMDA/Pioneer10/GTT.xml
+++ b/Instrument/AMDA/Pioneer10/GTT.xml
@@ -4,7 +4,8 @@
   <Instrument>
     <ResourceID>spase://CDPP/Instrument/AMDA/Pioneer10/GTT</ResourceID>
     <ResourceHeader>
-      <ResourceName>Geiger Tube Telescope</ResourceName>
+      <ResourceName>GTT</ResourceName>
+      <AlternateName>Geiger Tube Telescope</AlternateName>
       <ReleaseDate>2009-05-20T21:10:15Z</ReleaseDate>
       <Description>This experiment used seven miniature Geiger tubes in three arrays to measure proton and electron fluxes in interplanetary space and in the vicinity of Jupiter. Detector groupings were as follows: (1) a three-element (A, B, and C) differentially shielded telescope, with tube C shielded omnidirectionally and used for background subtraction to provide directional rates such as A-C (5-21 MeV electrons and 30-77.5 MeV protons) and B-C (0.55-21 MeV electrons and 6.6-77.5 MeV protons), (2) a three-element (D, E, and F) triangular array, each element responding to electrons above 31 MeV and protons above 77.5 MeV, and (3) a thin-window tube (G) with a gold-plated elbow as the aperture which admitted scattered electrons above 0.06 MeV while discriminating strongly against protons. Single element and coincidence rates were telemetered from the first two telescopes. The telemetry bit rate prevailing during the Jupiter encounter permitted directional sampling in intervals of about 14 deg of roll about the spin axis. For further details, see Baker and Van Allen, J. Geophys. Res., v. 81, p. 617, 1976.</Description>
       <Contact>
diff --git a/Instrument/AMDA/Pioneer11/GTT.xml b/Instrument/AMDA/Pioneer11/GTT.xml
index 2f6ca7f..451a463 100644
--- a/Instrument/AMDA/Pioneer11/GTT.xml
+++ b/Instrument/AMDA/Pioneer11/GTT.xml
@@ -4,7 +4,8 @@
   <Instrument>
     <ResourceID>spase://CDPP/Instrument/AMDA/Pioneer11/GTT</ResourceID>
     <ResourceHeader>
-      <ResourceName>Geiger Tube Telescope</ResourceName>
+      <ResourceName>GTT</ResourceName>
+      <AltrenateName>Geiger Tube Telescope</AltrenateName>
       <ReleaseDate>2009-05-20T21:10:01Z</ReleaseDate>
       <Description>This experiment used seven miniature Geiger tubes in three arrays to measure proton and electron fluxes near Jupiter and Saturn. Detector groupings were as follows: (1) a three-element (A, B, and C) differentially shielded telescope. Tube C was shielded omnidirectionally and was used for background subtraction to provide rates such as A-C (5 to 21 MeV electrons and 30 to 77.5 MeV protons) and B-C (0.55 to 21 MeV electrons and 6.6 to 77.5 MeV protons); (2) a three-element triangular array, each element responding to electrons above 31 MeV and protons above 77.5 MeV; and (3) a thin-window tube (G) with a gold-plated elbow as the entrance aperture to admit scattered electrons above 0.06 MeV while discriminating strongly against protons. For a description of the similar experiment on Pioneer 10, see J. A. Van Allen et al., J. Geophys. Res., v. 79, p. 3395, 1974. Early results are given in Science, v. 188, p. 459, 1975. Data include the interplanetary region.</Description>
       <Contact>
diff --git a/NumericalData/AMDA/Pioneer10/CRT/p10-crt-ele.xml b/NumericalData/AMDA/Pioneer10/CRT/p10-crt-ele.xml
index e1957f3..ab41f14 100644
--- a/NumericalData/AMDA/Pioneer10/CRT/p10-crt-ele.xml
+++ b/NumericalData/AMDA/Pioneer10/CRT/p10-crt-ele.xml
@@ -4,13 +4,18 @@
     <NumericalData>
         <ResourceID>spase://CDPP/NumericalData/AMDA/Pioneer10/CRT/p10-crt-ele</ResourceID>
         <ResourceHeader>
-            <ResourceName>Jupiter_Electrons@ONERA</ResourceName>
+            <ResourceName>electron flux</ResourceName>
             <ReleaseDate>2015-10-14T16:43:00</ReleaseDate>
             <Description/>
             <Contact>
                 <PersonID>spase://SMWG/Person/Elena.Budnik</PersonID>
                 <Role>GeneralContact</Role>
-            </Contact>
+            </Contact> 
+            <Association>
+                <AssociationID>p10-crt-jup</AssociationID>
+                <AssociationType>PartOf</AssociationType>
+                <Note>flyby jupiter</Note>
+            </Association>
         </ResourceHeader>
         <AccessInformation>
             <RepositoryID>spase://SMWG/Repository/CDPP/AMDA</RepositoryID>
@@ -33,12 +38,12 @@
         </TemporalDescription>
         <ObservedRegion>Jupiter</ObservedRegion>
         <Parameter>
-            <Name>electrons_flux_int</Name>
+            <Name>flux_int</Name>
             <ParameterKey>p10_crt_feio</ParameterKey>
             <Ucd>phys.density;phys.electron</Ucd> 
             <Units>cm-2.sr-1.s-1</Units>
             <RenderingHints>
-                <DisplayType>Spectrogram</DisplayType>
+                <DisplayType>StackPlot</DisplayType>
             </RenderingHints>
             <Structure>
                 <Size>2</Size>
@@ -59,7 +64,7 @@
             </Particle>
         </Parameter>
         <Parameter>
-            <Name>electrons_flux_dif</Name>
+            <Name>flux_dif</Name>
             <ParameterKey>p10_crt_fedo</ParameterKey>
             <Ucd>phys.flux.density;phys.count;phys.electron</Ucd>
             <Units>cm-2.sr-1.s-1.MeV-1</Units>
diff --git a/NumericalData/AMDA/Pioneer10/CRT/p10-crt-ion.xml b/NumericalData/AMDA/Pioneer10/CRT/p10-crt-ion.xml
index 2403892..3c6e43c 100644
--- a/NumericalData/AMDA/Pioneer10/CRT/p10-crt-ion.xml
+++ b/NumericalData/AMDA/Pioneer10/CRT/p10-crt-ion.xml
@@ -4,13 +4,18 @@
     <NumericalData>
         <ResourceID>spase://CDPP/NumericalData/AMDA/Pioneer10/CRT/p10-crt-ion</ResourceID>
         <ResourceHeader>
-            <ResourceName>Jupiter_Ions@ONERA</ResourceName>
+            <ResourceName>ion flux</ResourceName>
             <ReleaseDate>2015-10-14T16:44:00</ReleaseDate>
             <Description/>
             <Contact>
                 <PersonID>spase://SMWG/Person/Elena.Budnik</PersonID>
                 <Role>GeneralContact</Role>
-            </Contact>
+            </Contact>  
+            <Association>
+                <AssociationID>p10-crt-jup</AssociationID>
+                <AssociationType>PartOf</AssociationType>
+                <Note>flyby jupiter</Note>
+            </Association>
         </ResourceHeader>
         <AccessInformation>
             <RepositoryID>spase://SMWG/Repository/CDPP/AMDA</RepositoryID>
@@ -33,12 +38,12 @@
         </TemporalDescription>
         <ObservedRegion>Jupiter</ObservedRegion>
         <Parameter>
-            <Name>protons_flux_int</Name>
+            <Name>flux_int</Name>
             <ParameterKey>p10_crt_fpio</ParameterKey>
             <Ucd>phys.flux;phys.count;phys.atmol.ionStage</Ucd>
             <Units>cm-2.sr-1.s-1</Units>
             <RenderingHints>
-                <DisplayType>Spectrogram</DisplayType>
+                <DisplayType>StackPlot</DisplayType>
             </RenderingHints>
             <Structure>
                 <Size>8</Size>
@@ -90,12 +95,12 @@
             </Particle>
         </Parameter>
         <Parameter>
-            <Name>protons_flux_dif</Name>
+            <Name>flux_dif</Name>
             <ParameterKey>p10_crt_fpdo</ParameterKey>
             <Ucd>phys.flux.density;phys.count;phys.atmol.ionStage</Ucd>
             <Units>cm-2.sr-1.s-1.MeV-1</Units>
             <RenderingHints>
-                <DisplayType>Spectrogram</DisplayType>
+                <DisplayType>StackPlot</DisplayType>
             </RenderingHints>
             <Structure>
                 <Size>3</Size>
diff --git a/NumericalData/AMDA/Pioneer10/GTT/p10-gtt-ele.xml b/NumericalData/AMDA/Pioneer10/GTT/p10-gtt-ele.xml
index b79002d..49ebe26 100644
--- a/NumericalData/AMDA/Pioneer10/GTT/p10-gtt-ele.xml
+++ b/NumericalData/AMDA/Pioneer10/GTT/p10-gtt-ele.xml
@@ -4,13 +4,18 @@
     <NumericalData>
         <ResourceID>spase://CDPP/NumericalData/AMDA/Pioneer10/GTT/p10-gtt-ele</ResourceID>
         <ResourceHeader>
-            <ResourceName>Jupiter_Electrons@ONERA</ResourceName>
+            <ResourceName>electron flux</ResourceName>
             <ReleaseDate>2015-10-15T10:47:00</ReleaseDate>
             <Description/>
             <Contact>
                 <PersonID>spase://SMWG/Person/Elena.Budnik</PersonID>
                 <Role>GeneralContact</Role>
             </Contact>
+            <Association>
+                <AssociationID>p10-gtt-jup</AssociationID>
+                <AssociationType>PartOf</AssociationType>
+                <Note>flyby jupiter</Note>
+            </Association>
         </ResourceHeader>
         <AccessInformation>
             <RepositoryID>spase://SMWG/Repository/CDPP/AMDA</RepositoryID>
@@ -34,12 +39,12 @@
         </TemporalDescription>
         <ObservedRegion>Jupiter</ObservedRegion>
         <Parameter>
-            <Name>electrons_flux_int</Name>
+            <Name>flux_int</Name>
             <ParameterKey>p10_gtt_feio</ParameterKey>
             <Ucd>phys.density;phys.electron</Ucd>
             <Units>cm-2.sr-1.s-1</Units>
             <RenderingHints>
-                <DisplayType>Spectrogram</DisplayType>
+                <DisplayType>StackPlot</DisplayType>
             </RenderingHints>
             <Structure>
                 <Size>5</Size>
diff --git a/NumericalData/AMDA/Pioneer10/GTT/p10-gtt-ion.xml b/NumericalData/AMDA/Pioneer10/GTT/p10-gtt-ion.xml
index ef27246..5f72db4 100644
--- a/NumericalData/AMDA/Pioneer10/GTT/p10-gtt-ion.xml
+++ b/NumericalData/AMDA/Pioneer10/GTT/p10-gtt-ion.xml
@@ -4,13 +4,18 @@
     <NumericalData>
         <ResourceID>spase://CDPP/NumericalData/AMDA/Pioneer10/GTT/p10-gtt-ion</ResourceID>
         <ResourceHeader>
-            <ResourceName>Jupiter_Ions@ONERA</ResourceName>
+            <ResourceName>ion flux</ResourceName>
             <ReleaseDate>2015-10-14T10:34:00</ReleaseDate>
             <Description/>
             <Contact>
                 <PersonID>spase://SMWG/Person/Elena.Budnik</PersonID>
                 <Role>GeneralContact</Role>
-            </Contact>
+            </Contact> 
+            <Association>
+                <AssociationID>p10-gtt-jup</AssociationID>
+                <AssociationType>PartOf</AssociationType>
+                <Note>flyby jupiter</Note>
+            </Association>
         </ResourceHeader>
         <AccessInformation>
             <RepositoryID>spase://SMWG/Repository/CDPP/AMDA</RepositoryID>
@@ -34,12 +39,12 @@
         </TemporalDescription>
         <ObservedRegion>Jupiter</ObservedRegion>
         <Parameter>
-            <Name>protons_flux_dif</Name>
+            <Name>flux_dif</Name>
             <ParameterKey>p10_gtt_fpdo</ParameterKey>
             <Ucd>phys.flux.density;phys.count;phys.atmol.ionStage</Ucd>
             <Units>cm-2.sr-1.s-1.MeV-1</Units>
             <RenderingHints>
-                <DisplayType>Spectrogram</DisplayType>
+                <DisplayType>StackPlot</DisplayType>
             </RenderingHints>
             <Structure>
                 <Size>3</Size>
@@ -67,12 +72,12 @@
         </Parameter>
         
         <Parameter>
-            <Name>protons_flux_int</Name>
+            <Name>flux_int</Name>
             <ParameterKey>p10_gtt_fpio</ParameterKey>
             <Ucd>phys.flux;phys.count;phys.atmol.ionStage</Ucd>
             <Units>cm-2.sr-1.s-1</Units>
             <RenderingHints>
-                <DisplayType>Spectrogram</DisplayType>
+                <DisplayType>StackPlot</DisplayType>
             </RenderingHints>
             <Structure>
                 <Size>2</Size>
diff --git a/NumericalData/AMDA/Pioneer11/CRT/p11-crt-ele.xml b/NumericalData/AMDA/Pioneer11/CRT/p11-crt-ele.xml
index fcde419..c1ca201 100644
--- a/NumericalData/AMDA/Pioneer11/CRT/p11-crt-ele.xml
+++ b/NumericalData/AMDA/Pioneer11/CRT/p11-crt-ele.xml
@@ -4,13 +4,18 @@
     <NumericalData>
         <ResourceID>spase://CDPP/NumericalData/AMDA/Pioneer11/CRT/p11-crt-ele</ResourceID>
         <ResourceHeader>
-            <ResourceName>Jupiter_Electrons@ONERA</ResourceName>
+            <ResourceName>electron flux</ResourceName>
             <ReleaseDate>2015-10-15T16:43:00</ReleaseDate>
             <Description/>
             <Contact>
                 <PersonID>spase://SMWG/Person/Elena.Budnik</PersonID>
                 <Role>GeneralContact</Role>
             </Contact>
+            <Association>
+                <AssociationID>p11-crt-jup</AssociationID>
+                <AssociationType>PartOf</AssociationType>
+                <Note>flyby jupiter</Note>
+            </Association>
         </ResourceHeader>
         <AccessInformation>
             <RepositoryID>spase://SMWG/Repository/CDPP/AMDA</RepositoryID>
@@ -33,12 +38,12 @@
         </TemporalDescription>
         <ObservedRegion>Jupiter</ObservedRegion>
         <Parameter>
-            <Name>electrons_flux_int</Name>
+            <Name>flux_int</Name>
             <ParameterKey>p11_crt_feio</ParameterKey>
             <Ucd>phys.density;phys.electron</Ucd> 
             <Units>cm-2.sr-1.s-1</Units>
             <RenderingHints>
-                <DisplayType>Spectrogram</DisplayType>
+                <DisplayType>StackPlot</DisplayType>
             </RenderingHints>
             <Structure>
                 <Size>2</Size>
@@ -59,7 +64,7 @@
             </Particle>
         </Parameter>
         <Parameter>
-            <Name>electrons_flux_dif</Name>
+            <Name>flux_dif</Name>
             <ParameterKey>p11_crt_fedo</ParameterKey>
             <Ucd>phys.flux.density;phys.count;phys.electron</Ucd>
             <Units>cm-2.sr-1.s-1.MeV-1</Units>
diff --git a/NumericalData/AMDA/Pioneer11/CRT/p11-crt-ion.xml b/NumericalData/AMDA/Pioneer11/CRT/p11-crt-ion.xml
index 5ddfec7..ecddab8 100644
--- a/NumericalData/AMDA/Pioneer11/CRT/p11-crt-ion.xml
+++ b/NumericalData/AMDA/Pioneer11/CRT/p11-crt-ion.xml
@@ -4,13 +4,18 @@
     <NumericalData>
         <ResourceID>spase://CDPP/NumericalData/AMDA/Pioneer11/CRT/p11-crt-ion</ResourceID>
         <ResourceHeader>
-            <ResourceName>Jupiter_Ions@ONERA</ResourceName>
+            <ResourceName>ion flux</ResourceName>
             <ReleaseDate>2015-10-15T16:44:00</ReleaseDate>
             <Description/>
             <Contact>
                 <PersonID>spase://SMWG/Person/Elena.Budnik</PersonID>
                 <Role>GeneralContact</Role>
-            </Contact>
+            </Contact> 
+            <Association>
+                <AssociationID>p11-crt-jup</AssociationID>
+                <AssociationType>PartOf</AssociationType>
+                <Note>flyby jupiter</Note>
+            </Association>
         </ResourceHeader>
         <AccessInformation>
             <RepositoryID>spase://SMWG/Repository/CDPP/AMDA</RepositoryID>
@@ -33,12 +38,12 @@
         </TemporalDescription>
         <ObservedRegion>Jupiter</ObservedRegion>
         <Parameter>
-            <Name>protons_flux_int</Name>
+            <Name>flux_int</Name>
             <ParameterKey>p11_crt_fpio</ParameterKey>
             <Ucd>phys.flux;phys.count;phys.atmol.ionStage</Ucd>
             <Units>cm-2.sr-1.s-1</Units>
             <RenderingHints>
-                <DisplayType>Spectrogram</DisplayType>
+                <DisplayType>StackPlot</DisplayType>
             </RenderingHints>
             <Structure>
                 <Size>8</Size>
@@ -90,12 +95,12 @@
             </Particle>
         </Parameter>
         <Parameter>
-            <Name>protons_flux_dif</Name>
+            <Name>flux_dif</Name>
             <ParameterKey>p11_crt_fpdo</ParameterKey>
             <Ucd>phys.flux.density;phys.count;phys.atmol.ionStage</Ucd>
             <Units>cm-2.sr-1.s-1.MeV-1</Units>
             <RenderingHints>
-                <DisplayType>Spectrogram</DisplayType>
+                <DisplayType>StackPlot</DisplayType>
             </RenderingHints>
             <Structure>
                 <Size>3</Size>
diff --git a/NumericalData/AMDA/Pioneer11/GTT/p11-gtt-ele.xml b/NumericalData/AMDA/Pioneer11/GTT/p11-gtt-ele.xml
index ff97216..bf64f1c 100644
--- a/NumericalData/AMDA/Pioneer11/GTT/p11-gtt-ele.xml
+++ b/NumericalData/AMDA/Pioneer11/GTT/p11-gtt-ele.xml
@@ -4,13 +4,18 @@
     <NumericalData>
         <ResourceID>spase://CDPP/NumericalData/AMDA/Pioneer11/GTT/p11-gtt-ele</ResourceID>
         <ResourceHeader>
-            <ResourceName>Jupiter_Electrons@ONERA</ResourceName>
+            <ResourceName>electron flux</ResourceName>
             <ReleaseDate>2014-12-04T16:32:00</ReleaseDate>
             <Description/>
             <Contact>
                 <PersonID>spase://SMWG/Person/Elena.Budnik</PersonID>
                 <Role>GeneralContact</Role>
-            </Contact>
+            </Contact> 
+            <Association>
+                <AssociationID>p11-gtt-jup</AssociationID>
+                <AssociationType>PartOf</AssociationType>
+                <Note>flyby jupiter</Note>
+            </Association>
         </ResourceHeader>
         <AccessInformation>
             <RepositoryID>spase://SMWG/Repository/CDPP/AMDA</RepositoryID>
@@ -34,12 +39,12 @@
         </TemporalDescription>
         <ObservedRegion>Jupiter</ObservedRegion>
         <Parameter>
-            <Name>electrons_flux_int</Name>
+            <Name>flux_int</Name>
             <ParameterKey>p11_gtt_feio</ParameterKey>
             <Ucd>phys.density;phys.electron</Ucd>
             <Units>cm-2.sr-1.s-1</Units>
             <RenderingHints>
-                <DisplayType>Spectrogram</DisplayType>
+                <DisplayType>StackPlot</DisplayType>
             </RenderingHints>
             <Structure>
                 <Size>5</Size>
diff --git a/NumericalData/AMDA/Pioneer11/GTT/p11-gtt-ion.xml b/NumericalData/AMDA/Pioneer11/GTT/p11-gtt-ion.xml
index b31f6bb..eb27dfb 100644
--- a/NumericalData/AMDA/Pioneer11/GTT/p11-gtt-ion.xml
+++ b/NumericalData/AMDA/Pioneer11/GTT/p11-gtt-ion.xml
@@ -4,13 +4,18 @@
     <NumericalData>
         <ResourceID>spase://CDPP/NumericalData/AMDA/Pioneer11/GTT/p11-gtt-ion</ResourceID>
         <ResourceHeader>
-            <ResourceName>Jupiter_Ions@ONERA</ResourceName>
+            <ResourceName>ion flux</ResourceName>
             <ReleaseDate>2015-10-14T16:34:00</ReleaseDate>
             <Description/>
             <Contact>
                 <PersonID>spase://SMWG/Person/Elena.Budnik</PersonID>
                 <Role>GeneralContact</Role>
-            </Contact>
+            </Contact>  
+            <Association>
+                <AssociationID>p11-gtt-jup</AssociationID>
+                <AssociationType>PartOf</AssociationType>
+                <Note>flyby jupiter</Note>
+            </Association>
         </ResourceHeader>
         <AccessInformation>
             <RepositoryID>spase://SMWG/Repository/CDPP/AMDA</RepositoryID>
@@ -34,12 +39,12 @@
         </TemporalDescription>
         <ObservedRegion>Jupiter</ObservedRegion>
         <Parameter>
-            <Name>protons_flux_dif</Name>
+            <Name>flux_dif</Name>
             <ParameterKey>p11_gtt_fpdo</ParameterKey>
             <Ucd>phys.flux.density;phys.count;phys.atmol.ionStage</Ucd>
             <Units>cm-2.sr-1.s-1.MeV-1</Units>
             <RenderingHints>
-                <DisplayType>Spectrogram</DisplayType>
+                <DisplayType>StackPlot</DisplayType>
             </RenderingHints>
             <Structure>
                 <Size>3</Size>
@@ -66,12 +71,12 @@
             </Particle>
         </Parameter>
         <Parameter>
-            <Name>protons_flux_int</Name>
+            <Name>flux_int</Name>
             <ParameterKey>p11_gtt_fpio</ParameterKey>
             <Ucd>phys.flux;phys.count;phys.atmol.ionStage</Ucd>
             <Units>cm-2.sr-1.s-1</Units>
             <RenderingHints>
-                <DisplayType>Spectrogram</DisplayType>
+                <DisplayType>StackPlot</DisplayType>
             </RenderingHints>
             <Structure>
                 <Size>2</Size>
--
libgit2 0.21.2