Index: q2o/sos_adcp/trunk/sos_adcp/ADCP_System.xml
===================================================================
--- q2o/sos_adcp/trunk/sos_adcp/ADCP_System.xml (revision 428)
+++ q2o/sos_adcp/trunk/sos_adcp/ADCP_System.xml (revision 435)
@@ -7,5 +7,5 @@
     version="1.0.1">
     <sml:member>
-        <sml:ProcessChain gml:id="ADCP_System">
+        <sml:System gml:id="ADCP_System">
             <gml:description>System Description for the ADCP deployment at MVCO, version 2.2</gml:description>
             <gml:name>ADCP System</gml:name>
@@ -18,30 +18,18 @@
                     <sml:input name="seaWaterPressure">
                         <swe:ObservableProperty definition="http://mmisw.org/ont/mvco/observableProperty/seaWaterPressure">
-                            <gml:description>forces on a particular point including sea water and air pressure</gml:description>
                         </swe:ObservableProperty>
                     </sml:input>
                     <sml:input name="seaWaterTemperature">
                         <swe:ObservableProperty definition="http://mmisw.org/ont/mvco/observableProperty/seaWaterTemperature">
-                            <gml:description>heat energy of sea water</gml:description>
                         </swe:ObservableProperty>
                     </sml:input>
                     <sml:input name="volumetricBackscatter">
                         <swe:ObservableProperty definition="http://mmisw.org/ont/mvco/observableProperty/volumetricBackscatter">
-                            <gml:description>portion of an acoustic signal that is returned by hitting a particler</gml:description>
+                            <gml:description>doppler backscatter</gml:description>
                         </swe:ObservableProperty>
                     </sml:input>
                     <sml:input name="particleMotion">
                         <swe:ObservableProperty definition="http://mmisw.org/ont/mvco/observableProperty/particleMotion">
-                            <gml:description>three dimensional movement of a particle in a fluid</gml:description>
-                        </swe:ObservableProperty>
-                    </sml:input>
-                    <sml:input name="tilt">
-                        <swe:ObservableProperty definition="http://mmisw.org/ont/rdi/observableProperty/tilt">
-                            <gml:description>tilt of sensor</gml:description>
-                        </swe:ObservableProperty>
-                    </sml:input>
-                    <sml:input name="heading">
-                        <swe:ObservableProperty definition="http://mmisw.org/ont/rdi/observableProperty/heading">
-                            <gml:description>heading of sensor</gml:description>
+                            <gml:description></gml:description>
                         </swe:ObservableProperty>
                     </sml:input>
@@ -60,12 +48,10 @@
                             </swe:field>
                             <swe:field name="lat">
-                                <swe:Quantity definition="urn:ogc:def:property:latitude" 
-                                              referenceFrame="urn:ogc:def:crs,crs:EPSG:6.15:4326">
+                                <swe:Quantity definition="urn:ogc:def:property:latitude">
                                     <swe:uom code="deg"/>
                                 </swe:Quantity> 
                             </swe:field>
                             <swe:field name="lon">
-                                <swe:Quantity definition="urn:ogc:def:property:longitude"
-                                              referenceFrame="urn:ogc:def:crs,crs:EPSG:6.15:4326">
+                                <swe:Quantity definition="urn:ogc:def:property:longitude">
                                     <swe:uom code="deg"/>
                                 </swe:Quantity> 
@@ -222,17 +208,17 @@
                 <sml:ComponentList>
                     <sml:component name="MVCO_Workhorse" xlink:role="urn:ogc:def:process:OGC:system"  
-                        xlink:href="http://vast.uah.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.1/MVCO_Workhorse_1200.xml"/>
+                        xlink:href="http://mvcodata.whoi.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.2/MVCO_Workhorse_1200.xml"/>
                     <sml:component name="RDI_Workhorse" xlink:role="urn:ogc:def:process:OGC:system" 
-                        xlink:href="http://vast.uah.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.1/RDI_Workhorse_1200.xml"/>
+                        xlink:href="http://mvcodata.whoi.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.2/RDI_Workhorse_1200.xml"/>
                     <sml:component name="Velocity_QC_Chain" xlink:role="urn:ogc:def:process:OGC:process"
-                        xlink:href="http://vast.uah.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.1/Velocity_QC_Chain.xml"/>
+                        xlink:href="http://mvcodata.whoi.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.2/Velocity_QC_Chain.xml"/>
                     <sml:component name="Pressure_QC_Chain" xlink:role="urn:ogc:def:process:OGC:process"
-                        xlink:href="http://vast.uah.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.1/Pressure_QC_Chain.xml"/>
+                        xlink:href="http://mvcodata.whoi.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.2/Pressure_QC_Chain.xml"/>
                     <sml:component name="PressureObservableProcess" xlink:role="urn:ogc:def:process:OGC:process" 
-                        xlink:href="http://vast.uah.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.1/Pressure_Obs_Process.xml"/>
+                        xlink:href="http://mvcodata.whoi.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.2/Pressure_Obs_Process.xml"/>
                     <sml:component name="VelocityObservableProcess" xlink:role="urn:ogc:def:process:OGC:process" 
-                        xlink:href="http://vast.uah.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.1/Velocity_Obs_Process.xml"/>
+                        xlink:href="http://mvcodata.whoi.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.2/Velocity_Obs_Process.xml"/>
                     <sml:component name="PUV_Analysis" xlink:role="urn:ogc:def:process:OGC:process" 
-                        xlink:href="http://vast.uah.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.1/PUV_Analysis.xml"/>
+                        xlink:href="http://mvcodata.whoi.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.2/PUV_Analysis.xml"/>
                 </sml:ComponentList>
             </sml:components>
@@ -265,16 +251,4 @@
                         </sml:Link>
                     </sml:connection>
-                    <sml:connection>
-                        <sml:Link>
-                            <sml:source ref="this/inputs/tilt"/>
-                            <sml:destination ref="RDI_Workhorse/inputs/tilt"/>
-                        </sml:Link>
-                    </sml:connection>
-                    <sml:connection>
-                        <sml:Link>
-                            <sml:source ref="this/inputs/heading"/>
-                            <sml:destination ref="RDI_Workhorse/inputs/heading"/>
-                        </sml:Link>
-                    </sml:connection>
                     
                     <!--  Pressure_QC_Chain connections -->
@@ -433,5 +407,5 @@
             </sml:connections>
             
-        </sml:ProcessChain>
+        </sml:System>
     </sml:member>
 </sml:SensorML>
Index: q2o/sos_adcp/trunk/sos_adcp/ChangeOut.xml
===================================================================
--- q2o/sos_adcp/trunk/sos_adcp/ChangeOut.xml (revision 394)
+++ q2o/sos_adcp/trunk/sos_adcp/ChangeOut.xml (revision 435)
@@ -11,5 +11,5 @@
                               </swe:Category>
                            </swe:field>
-                           <swe:field name="ComponentID" xlink:href="http://vastserver.nsstc.uah.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.1/RDI_Workhorse_1200.xml#RDI_Workhorse_1200"/>
+                           <swe:field name="ComponentID" xlink:href="http://mvcodata.whoi.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.2/RDI_Workhorse_1200.xml#RDI_Workhorse_1200"/>
                            <swe:field name="SerialNumber">
                               <swe:Category definition="urn:ogc:def:identifier:OGC:serialNumber">
Index: q2o/sos_adcp/trunk/sos_adcp/MVCO_ObservingSystem.xml
===================================================================
--- q2o/sos_adcp/trunk/sos_adcp/MVCO_ObservingSystem.xml (revision 434)
+++ q2o/sos_adcp/trunk/sos_adcp/MVCO_ObservingSystem.xml (revision 435)
@@ -9,36 +9,28 @@
         <sml:System gml:id="MVCO_System">
             <gml:description>A cabled observatory south of Marthas Vineyard, MASS (USA), owned and operated
-                by the Woods Hole Oceanographic Institution (WHOI).
+                             by the Woods Hole Oceanographic Institution (WHOI).
             </gml:description>
             <gml:name>Marthas Vineyard Coastal Observatory</gml:name>
-            <sml:location>
-                <gml:Point srsName="urn:ogc:def:crs:EPSG::4326">
-                    <gml:pos>
-                        41.1667 -70.8333
-                    </gml:pos>
-                </gml:Point>
-            </sml:location>
+            
+            <gml:boundedBy>
+                <gml:Envelope>
+                    <gml:lowerCorner srsName="urn:ogc:def:crs:EPSG:6.15:4326">41.1667 -70.8333</gml:lowerCorner>
+                    <gml:upperCorner srsName="urn:ogc:def:crs:EPSG:6.15:4326">41.4167 -70.1667</gml:upperCorner>
+                </gml:Envelope>
+            </gml:boundedBy>
+            
             <sml:components >
                 <sml:ComponentList>
-                    <sml:component name="Shore Lab">
+                    <sml:component name="Shore Lab" >
                         <sml:System>
-                            <gml:description>MVCO Shore lab description needed</gml:description>
-                            <gml:name>MVCO shore lab</gml:name>
-                            <sml:identification>
-                                <sml:IdentifierList>
-                                    <sml:identifier name="longName">
-                                        <sml:Term definition="urn:ogc:def:property:OGC:longName">
-                                            <sml:value>MVCO_Shore_Lab</sml:value>
-                                        </sml:Term>
-                                    </sml:identifier>
-                                </sml:IdentifierList>
-                            </sml:identification>
-                            <sml:location>
-                                <gml:Point srsName="urn:ogc:def:crs:EPSG::4326">
-                                    <gml:pos>
-                                        41.3620 -70.5225
-                                    </gml:pos>
-                                </gml:Point>
-                            </sml:location>
+                            <gml:description></gml:description>
+                            <gml:name></gml:name>
+                            <gml:boundedBy>
+                                <gml:Envelope>
+                                    <gml:lowerCorner srsName="urn:ogc:def:crs:EPSG:6.15:4326">41.3620 -70.5225</gml:lowerCorner>
+                                    <gml:upperCorner srsName="urn:ogc:def:crs:EPSG:6.15:4326">41.3620 -70.5225</gml:upperCorner>
+                                </gml:Envelope>
+                            </gml:boundedBy>
+                            <sml:components>...</sml:components>
                         </sml:System>
                     </sml:component>
@@ -47,61 +39,35 @@
                         <sml:System>
                             <gml:description>A mast on the beach where instruments are mounted for taking images and making
-                                marine meteorological observations.  It is equipped with power and fiber-optic
-                                communications and is part of the MVCO infrastructure.
+                                             marine meteorological observations.  It is equipped with power and fiber-optic
+                                             communications and is part of the MVCO infrastructure.
                             </gml:description>
                             <gml:name>MVCO Node at South Beach </gml:name>
-                            <sml:identification>
-                                <sml:IdentifierList>
-                                    <sml:identifier name="longName">
-                                        <sml:Term definition="urn:ogc:def:property:OGC:longName">
-                                            <sml:value>MVCO_SouthBeachNode</sml:value>
-                                        </sml:Term>
-                                    </sml:identifier>
-                                </sml:IdentifierList>
-                            </sml:identification>
-                            <sml:location>
-                                <gml:Point srsName="urn:ogc:def:crs:EPSG::4326">
-                                    <gml:pos>
-                                        41.3499 -70.5267
-                                    </gml:pos>
-                                </gml:Point>
-                            </sml:location>
+                            <gml:boundedBy>
+                                <gml:Envelope>
+                                    <gml:lowerCorner srsName="urn:ogc:def:crs:EPSG:6.15:4326">41.3499 -70.5267</gml:lowerCorner>
+                                    <gml:upperCorner srsName="urn:ogc:def:crs:EPSG:6.15:4326">41.3499 -70.5267</gml:upperCorner>
+                                </gml:Envelope>
+                            </gml:boundedBy>
                         </sml:System>
                     </sml:component>
                     
                     <sml:component name="12mNode">
-                        <sml:System>
+                        <sml:System gml:id="12mNode">
                             <gml:description>A fixed subsea platform at the 13 meter isobath equipped with power and fiber-optic
-                                communications.  It is part of the MVCO.
+                                             communications.  It is part of the MVCO.
                             </gml:description>
                             <gml:name>MVCO_12m-Node</gml:name>
-                            <sml:identification>
-                                <sml:IdentifierList>
-                                    <sml:identifier name="longName">
-                                        <sml:Term definition="urn:ogc:def:property:OGC:longName">
-                                            <sml:value>MVCO_12m_Node</sml:value>
-                                        </sml:Term>
-                                    </sml:identifier>
-                                </sml:IdentifierList>
-                            </sml:identification>
-                            <sml:documentation xlink:arcrole="photo">
-                                <sml:Document>
-                                    <gml:description>Diagram of the 12m Node</gml:description>
-                                    <sml:onlineResource xlink:href="http://mvcodata.whoi.edu/mvco/node12m_watercolumn_section.png"/>
-                                </sml:Document>
-                            </sml:documentation>
-                            <sml:location>
-                                <gml:Point srsName="urn:ogc:def:crs:EPSG::4326">
-                                    <gml:pos>
-                                        41.3499 -70.5267
-                                    </gml:pos>
-                                </gml:Point>
-                            </sml:location>
+                            <gml:boundedBy>
+                                <gml:Envelope>
+                                    <gml:lowerCorner srsName="urn:ogc:def:crs:EPSG:6.15:4326">41.3499 -70.5267</gml:lowerCorner>
+                                    <gml:upperCorner srsName="urn:ogc:def:crs:EPSG:6.15:4326">41.3499 -70.5267</gml:upperCorner>
+                                </gml:Envelope>
+                            </gml:boundedBy>
                             <sml:components>
                                 <sml:ComponentList>
-                                    <sml:component name="PressureGauge" xlink:arcrole="urn:ogc:def:process:OGC:detector"/>
-                                    <sml:component name="SalinitySensor" xlink:arcrole="urn:ogc:def:process:OGC:detector"/>
+                                    <sml:component name="PressureGauge"></sml:component>
+                                    <sml:component name="SalinitySensor"></sml:component>
                                     <sml:component name="ADCP System" xlink:role="urn:ogc:def:process:OGC:system"  
-                                        xlink:href="http://vast.uah.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.1/ADCP_System.xml"/>
+                                        xlink:href="http://mvcodata.whoi.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.1/ADCP_System.xml"/>
                                 </sml:ComponentList>
                             </sml:components>
@@ -112,23 +78,13 @@
                         <sml:System>
                             <gml:description>A fixed platform at the 16 meter isobath equipped with power and fiber-optic
-                                communications.  It is part of the MVCO.
+                                             communications.  It is part of the MVCO.
                             </gml:description>
                             <gml:name>Air-Sea Interaction Tower</gml:name>
-                            <sml:identification>
-                                <sml:IdentifierList>
-                                    <sml:identifier name="longName">
-                                        <sml:Term definition="urn:ogc:def:property:OGC:longName">
-                                            <sml:value>MVCO_AirSeaInteractionTower</sml:value>
-                                        </sml:Term>
-                                    </sml:identifier>
-                                </sml:IdentifierList>
-                            </sml:identification>
-                            <sml:location>
-                                <gml:Point srsName="urn:ogc:def:crs:EPSG::4326">
-                                    <gml:pos>
-                                        41.325 -70.5667
-                                    </gml:pos>
-                                </gml:Point>
-                            </sml:location>
+                            <gml:boundedBy>
+                                <gml:Envelope>
+                                    <gml:lowerCorner srsName="urn:ogc:def:crs:EPSG:6.15:4326">41.325 -70.5667</gml:lowerCorner>
+                                    <gml:upperCorner srsName="urn:ogc:def:crs:EPSG:6.15:4326">41.325 -70.5667</gml:upperCorner>
+                                </gml:Envelope>
+                            </gml:boundedBy>
                         </sml:System>
                     </sml:component>
Index: q2o/sos_adcp/trunk/sos_adcp/MVCO_Workhorse_1200.xml
===================================================================
--- q2o/sos_adcp/trunk/sos_adcp/MVCO_Workhorse_1200.xml (revision 424)
+++ q2o/sos_adcp/trunk/sos_adcp/MVCO_Workhorse_1200.xml (revision 435)
@@ -39,7 +39,8 @@
                   </sml:Term>
                </sml:identifier>
-               <sml:identifier name="Current Serial Number">
-                  <sml:Term>
-                     <sml:value>10295</sml:value>
+               <sml:identifier name="Serial Number">
+                  <sml:Term definition="urn:ogc:def:identifier:OGC:serialNumber">
+                     <sml:codeSpace xlink:href="urn:ogc:def:identifier:SBE:serialNumber"/>
+                     <sml:value>14391</sml:value>
                   </sml:Term>
                </sml:identifier>
@@ -86,5 +87,5 @@
          <sml:contact xlink:arcrole="urn:ogc:def:property:OGC:operator">
             <sml:ResponsibleParty>
-               <sml:individualName>Janet Fredricks</sml:individualName>
+               <sml:individualName>Janet Fredericks</sml:individualName>
                <sml:organizationName>Woods Hole Oceanographic Institution</sml:organizationName>
                <sml:contactInfo>
@@ -113,5 +114,5 @@
                <sml:member name="System Deployment">
                   <sml:Event>
-                     <sml:date>2001-04-20Z</sml:date>
+                     <sml:date>2001-04-20</sml:date>
                      <gml:description>Initial System Deployment</gml:description>
                      <sml:property name="Deployment parameters">
@@ -123,5 +124,5 @@
                               </swe:Category>
                            </swe:field>
-                           <swe:field name="ComponentID" xlink:href="http://vastserver.nsstc.uah.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.1/RDI_Workhorse_1200.xml#RDI_Workhorse_1200"/>
+                           <swe:field name="ComponentID" xlink:href="http://mvcodata.whoi.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.1/RDI_Workhorse_1200.xml#RDI_Workhorse_1200"/>
                            <swe:field name="SerialNumber">
                               <swe:Category definition="urn:ogc:def:identifier:OGC:serialNumber">
@@ -131,10 +132,10 @@
                            <swe:field name="ManufactureDate">
                               <swe:Time>
-                                 <swe:value>2007-09-01T00:00:00</swe:value>
+                                 <swe:value>2007-09-01T00:00:00Z</swe:value>
                               </swe:Time>
                            </swe:field>
                            <swe:field name="DeploymentTimeRange">
                               <swe:TimeRange>
-                                 <swe:value>2001-04-20T00:00:00 2009-08-31T23:00:00</swe:value>
+                                 <swe:value>2001-04-20T00:00:00Z 2009-08-31T23:00:00Z</swe:value>
                               </swe:TimeRange>
                            </swe:field>
@@ -152,5 +153,5 @@
                <sml:member name="Sensor Change">
                   <sml:Event>
-                     <sml:date>2007-11-20Z</sml:date>
+                     <sml:date>2007-11-20</sml:date>
                      <gml:description>Sensor Change</gml:description>
                      <sml:property name="Sensor Change parameters">
@@ -162,5 +163,5 @@
                               </swe:Category>
                            </swe:field>
-                           <swe:field name="ComponentID" xlink:href="http://vastserver.nsstc.uah.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.1/RDI_Workhorse_1200.xml#RDI_Workhorse_1200"/>
+                           <swe:field name="ComponentID" xlink:href="http://mvcodata.whoi.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.1/RDI_Workhorse_1200.xml#RDI_Workhorse_1200"/>
                            <swe:field name="SerialNumber">
                               <swe:Category definition="urn:ogc:def:identifier:OGC:serialNumber">
@@ -170,5 +171,5 @@
                            <swe:field name="ManufactureDate">
                               <swe:Time>
-                                 <swe:value>2007-11-20T00:00:00</swe:value>
+                                 <swe:value>2007-11-20T00:00:00Z</swe:value>
                               </swe:Time>
                            </swe:field>
@@ -201,5 +202,5 @@
                               </swe:Category>
                            </swe:field>
-                           <swe:field name="ComponentID" xlink:href="http://vastserver.nsstc.uah.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.1/RDI_Workhorse_1200.xml#TemperatureSensor"/>
+                           <swe:field name="ComponentID" xlink:href="http://mvcodata.whoi.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.1/RDI_Workhorse_1200.xml#TemperatureSensor"/>
                            <swe:field name="ManufactureDate">
                               <swe:Time>
@@ -234,5 +235,5 @@
                               </swe:Category>
                            </swe:field>
-                           <swe:field name="ComponentID" xlink:href="http://vastserver.nsstc.uah.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.1/RDI_Workhorse_1200.xml#TemperatureSensor"/>
+                           <swe:field name="ComponentID" xlink:href="http://mvcodata.whoi.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.1/RDI_Workhorse_1200.xml#TemperatureSensor"/>
                            <swe:field name="ManufactureDate">
                               <swe:Time>
@@ -267,5 +268,5 @@
                               </swe:Category>
                            </swe:field>
-                           <swe:field name="ComponentID" xlink:href="http://vastserver.nsstc.uah.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.1/RDI_Workhorse_1200.xml#PressureSensor"/>
+                           <swe:field name="ComponentID" xlink:href="http://mvcodata.whoi.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.1/RDI_Workhorse_1200.xml#PressureSensor"/>
                            <swe:field name="ManufactureDate">
                               <swe:Time>
@@ -300,5 +301,5 @@
                               </swe:Category>
                            </swe:field>
-                           <swe:field name="ComponentID" xlink:href="http://vastserver.nsstc.uah.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.1/RDI_Workhorse_1200.xml#PressureSensor"/>
+                           <swe:field name="ComponentID" xlink:href="http://mvcodata.whoi.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.1/RDI_Workhorse_1200.xml#PressureSensor"/>
                            <swe:field name="ManufactureDate">
                               <swe:Time>
@@ -321,8 +322,8 @@
                </sml:member>
                
-               <sml:member name="Sensor Deployment">
+               <sml:member name="Transducer Deployment">
                   <sml:Event>
                      <sml:date>2001-04-20Z</sml:date>
-                     <gml:description>Deployment data for Transducer</gml:description>
+                     <gml:description>Deployment data for Transducers</gml:description>
                      <sml:property name="Deployment Data">
                         <swe:DataRecord>
@@ -333,5 +334,5 @@
                               </swe:Category>
                            </swe:field>
-                           <swe:field name="ComponentID" xlink:href="http://vastserver.nsstc.uah.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.1/RDI_Workhorse_1200.xml#Transducer"/>
+                           <swe:field name="ComponentID" xlink:href="http://mvcodata.whoi.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.1/RDI_Workhorse_1200.xml#Transducer"/>
                            <swe:field name="ManufactureDate">
                               <swe:Time>
@@ -361,5 +362,5 @@
                               </swe:Category>
                            </swe:field>
-                           <swe:field name="ComponentID" xlink:href="http://vastserver.nsstc.uah.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.1/RDI_Workhorse_1200.xml#Transducer"/>
+                           <swe:field name="ComponentID" xlink:href="http://mvcodata.whoi.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.1/RDI_Workhorse_1200.xml#Transducer"/>
                            <swe:field name="ManufactureDate">
                               <swe:Time>
@@ -389,5 +390,5 @@
                               </swe:Category>
                            </swe:field>
-                           <swe:field name="ComponentID" xlink:href="http://vastserver.nsstc.uah.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.1/RDI_Workhorse_1200.xml#PressureSensor"/>
+                           <swe:field name="ComponentID" xlink:href="http://mvcodata.whoi.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.1/RDI_Workhorse_1200.xml#PressureSensor"/>
                         </swe:DataRecord>
                      </sml:property>
@@ -407,5 +408,5 @@
                               </swe:Category>
                            </swe:field>
-                           <swe:field name="ComponentID" xlink:href="http://vastserver.nsstc.uah.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.1/RDI_Workhorse_1200.xml#PressureSensor"/>
+                           <swe:field name="ComponentID" xlink:href="http://mvcodata.whoi.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.1/RDI_Workhorse_1200.xml#PressureSensor"/>
                         </swe:DataRecord>
                      </sml:property>
@@ -425,5 +426,5 @@
                               </swe:Category>
                            </swe:field>
-                           <swe:field name="ComponentID" xlink:href="http://vastserver.nsstc.uah.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.1/RDI_Workhorse_1200.xml#Transducer"/>
+                           <swe:field name="ComponentID" xlink:href="http://mvcodata.whoi.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.1/RDI_Workhorse_1200.xml#Transducer"/>
                         </swe:DataRecord>
                      </sml:property>
@@ -443,5 +444,5 @@
                               </swe:Category>
                            </swe:field>
-                           <swe:field name="ComponentID" xlink:href="http://vastserver.nsstc.uah.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.1/RDI_Workhorse_1200.xml#Transducer"/>
+                           <swe:field name="ComponentID" xlink:href="http://mvcodata.whoi.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.1/RDI_Workhorse_1200.xml#Transducer"/>
                         </swe:DataRecord>
                      </sml:property>
@@ -461,5 +462,5 @@
                               </swe:Category>
                            </swe:field>
-                           <swe:field name="ComponentID" xlink:href="http://vastserver.nsstc.uah.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.1/RDI_Workhorse_1200.xml#Transducer"/>
+                           <swe:field name="ComponentID" xlink:href="http://mvcodata.whoi.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.1/RDI_Workhorse_1200.xml#Transducer"/>
                         </swe:DataRecord>
                      </sml:property>
@@ -479,5 +480,5 @@
                               </swe:Category>
                            </swe:field>
-                           <swe:field name="ComponentID" xlink:href="http://vastserver.nsstc.uah.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.1/RDI_Workhorse_1200.xml#Transducer"/>
+                           <swe:field name="ComponentID" xlink:href="http://mvcodata.whoi.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.1/RDI_Workhorse_1200.xml#Transducer"/>
                         </swe:DataRecord>
                      </sml:property>
@@ -497,5 +498,5 @@
                               </swe:Category>
                            </swe:field>
-                           <swe:field name="ComponentID" xlink:href="http://vastserver.nsstc.uah.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.1/RDI_Workhorse_1200.xml#Transducer"/>
+                           <swe:field name="ComponentID" xlink:href="http://mvcodata.whoi.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.1/RDI_Workhorse_1200.xml#Transducer"/>
                         </swe:DataRecord>
                      </sml:property>
@@ -516,5 +517,5 @@
                               </swe:Category>
                            </swe:field>
-                           <swe:field name="ComponentID" xlink:href="http://vastserver.nsstc.uah.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.1/RDI_Workhorse_1200.xml#RDI_Workhorse_1200"/>
+                           <swe:field name="ComponentID" xlink:href="http://mvcodata.whoi.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.1/MVCO_ObservingSystem.xml#12mNode"/>
                         </swe:DataRecord>
                      </sml:property>
@@ -534,5 +535,5 @@
                               </swe:Category>
                            </swe:field>
-                           <swe:field name="ComponentID" xlink:href="http://vastserver.nsstc.uah.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.1/RDI_Workhorse_1200.xml#Transducer"/>
+                           <swe:field name="ComponentID" xlink:href="http://mvcodata.whoi.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.1/RDI_Workhorse_1200.xml#Transducer"/>
                         </swe:DataRecord>
                      </sml:property>
@@ -552,5 +553,5 @@
                               </swe:Category>
                            </swe:field>
-                           <swe:field name="ComponentID" xlink:href="http://vastserver.nsstc.uah.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.1/RDI_Workhorse_1200.xml#Transducer"/>
+                           <swe:field name="ComponentID" xlink:href="http://mvcodata.whoi.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.1/RDI_Workhorse_1200.xml#Transducer"/>
                         </swe:DataRecord>
                      </sml:property>
@@ -570,5 +571,5 @@
                               </swe:Category>
                            </swe:field>
-                           <swe:field name="ComponentID" xlink:href="http://vastserver.nsstc.uah.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.1/RDI_Workhorse_1200.xml#Transducer"/>
+                           <swe:field name="ComponentID" xlink:href="http://mvcodata.whoi.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.1/RDI_Workhorse_1200.xml#Transducer"/>
                         </swe:DataRecord>
                      </sml:property>
@@ -633,5 +634,5 @@
          <sml:components>
             <sml:ComponentList>
-               <sml:component name="RDI_Workhorse" xlink:href="http://vast.uah.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.1/RDI_Workhorse_1200.xml"/>
+               <sml:component name="RDI_Workhorse" xlink:href="http://mvcodata.whoi.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.1/RDI_Workhorse_1200.xml"/>
                
             </sml:ComponentList>
Index: q2o/sos_adcp/trunk/sos_adcp/MinThresholdSeriesTest.xml
===================================================================
--- q2o/sos_adcp/trunk/sos_adcp/MinThresholdSeriesTest.xml (revision 432)
+++ q2o/sos_adcp/trunk/sos_adcp/MinThresholdSeriesTest.xml (revision 435)
@@ -9,13 +9,6 @@
             <gml:description></gml:description>
             <gml:name>MinThresholdSeriesTest</gml:name>
-            <classification>
-                <ClassifierList>
-                    <classifier name="processType">
-                        <Term definition="http://mmisw.org/ont/mvco/process">
-                            <value>http://mmisw.org/ont/mvco/process/MinThresholdSeriesTest</value>
-                        </Term>
-                    </classifier>
-                </ClassifierList>
-            </classification>      
+            <classification/>
+            
             <inputs>
                 <InputList>
@@ -65,5 +58,5 @@
             <components>
                 <ComponentList>
-                    <component name="MinThresholdTest" xlink:href="http://mvcodata.whoi.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.2/MinThresholdTest.xml"/>
+                    <component name="MinThresholdTest" xlink:href="http://mvcodata.whoi.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.1/MinThresholdTest.xml"/>
                 </ComponentList>
             </components>
Index: q2o/sos_adcp/trunk/sos_adcp/Pressure_QC_Chain.xml
===================================================================
--- q2o/sos_adcp/trunk/sos_adcp/Pressure_QC_Chain.xml (revision 431)
+++ q2o/sos_adcp/trunk/sos_adcp/Pressure_QC_Chain.xml (revision 435)
@@ -6,5 +6,5 @@
     xsi:schemaLocation="http://www.opengis.net/sensorML/1.0.1 http://schemas.opengis.net/sensorML/1.0.1/sensorML.xsd"
     version="1.0.1">
-    <sml:member>
+    <sml:member xlink:href="">
         <sml:ProcessChain gml:id="Pressure_QC_Chain">
             <gml:description>General Process Chain for Pressure Observations </gml:description>
@@ -13,6 +13,7 @@
                 <sml:ClassifierList>
                     <sml:classifier name="processType">
-                        <sml:Term definition="http://mmisw.org/ont/mvco/process">
-                            <sml:value>http://mmisw.org/ont/mvco/process/PressureQCchain</sml:value>
+                        <sml:Term definition="http://mmisw.org/ont/MVCO/test/QcCategory">
+                            <sml:codeSpace xlink:href="http://mmisw.org/ont/MVCO/test/QcCategory"/>
+                            <sml:value>http://mmisw.org/ont/MVCO/process/Pressure_QC_Chain</sml:value>
                         </sml:Term>
                     </sml:classifier>
@@ -119,5 +120,5 @@
             <sml:components>
                 <sml:ComponentList>
-                    <sml:component name="TimeSeriesChain" xlink:href="http://mvcodata.whoi.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.2/TimeSeriesChain.xml"/>
+                    <sml:component name="TimeSeriesChain" xlink:href="http://mvcodata.whoi.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.1/TimeSeriesChain.xml"/>
                 </sml:ComponentList>
             </sml:components>
Index: q2o/sos_adcp/trunk/sos_adcp/Pressure_QC_Chain_Values.xml
===================================================================
--- q2o/sos_adcp/trunk/sos_adcp/Pressure_QC_Chain_Values.xml (revision 424)
+++ q2o/sos_adcp/trunk/sos_adcp/Pressure_QC_Chain_Values.xml (revision 435)
@@ -6,5 +6,5 @@
     xsi:schemaLocation="http://www.opengis.net/sensorML/1.0.1 http://schemas.opengis.net/sensorML/1.0.1/sensorML.xsd"
     version="1.0.1">
-    <sml:member>
+    <sml:member xlink:href="">
         <sml:ProcessChain gml:id="Pressure_QC_Chain">
             <gml:description>General Process Chain for Pressure Observations </gml:description>
@@ -133,5 +133,5 @@
             <sml:components>
                 <sml:ComponentList>
-                    <sml:component name="TimeSeriesChain" xlink:href="http://vast.uah.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.1/TimeSeriesChain.xml"/>
+                    <sml:component name="TimeSeriesChain" xlink:href="http://mvcodata.whoi.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.1/TimeSeriesChain.xml"/>
                 </sml:ComponentList>
             </sml:components>
Index: q2o/sos_adcp/trunk/sos_adcp/Pressure_QC_Chain_Values_2.0.xml
===================================================================
--- q2o/sos_adcp/trunk/sos_adcp/Pressure_QC_Chain_Values_2.0.xml (revision 394)
+++ q2o/sos_adcp/trunk/sos_adcp/Pressure_QC_Chain_Values_2.0.xml (revision 435)
Index: q2o/sos_adcp/trunk/sos_adcp/QcParamTemplate.xml
===================================================================
--- q2o/sos_adcp/trunk/sos_adcp/QcParamTemplate.xml (revision 394)
+++ q2o/sos_adcp/trunk/sos_adcp/QcParamTemplate.xml (revision 435)
Index: q2o/sos_adcp/trunk/sos_adcp/RDI_Workhorse_1200.xml
===================================================================
--- q2o/sos_adcp/trunk/sos_adcp/RDI_Workhorse_1200.xml (revision 424)
+++ q2o/sos_adcp/trunk/sos_adcp/RDI_Workhorse_1200.xml (revision 435)
@@ -118,5 +118,5 @@
                      </swe:field>
                      
-                     <swe:field name="wieghtInSeaWater">
+                     <swe:field name="weightInSeaWater">
                         <swe:ConditionalValue>
                            <swe:condition name="medium">
@@ -205,5 +205,5 @@
                      </swe:field>
                      
-                     <swe:field name="wieghtInSeaWater">
+                     <swe:field name="weightInSeaWater">
                         <swe:ConditionalValue>
                            <swe:condition name="medium">
@@ -282,5 +282,5 @@
                      </swe:field>
                      
-                     <swe:field name="wieghtInSeaWater">
+                     <swe:field name="weightInSeaWater">
                         <swe:ConditionalValue>
                            <swe:condition name="medium">
@@ -360,5 +360,5 @@
                      </swe:field>
                      
-                     <swe:field name="wieghtInSeaWater">
+                     <swe:field name="weightInSeaWater">
                         <swe:ConditionalValue>
                            <swe:condition name="medium">
@@ -531,4 +531,5 @@
                
             </swe:DataRecord>
+            
          </sml:capabilities>
          
@@ -627,14 +628,4 @@
                <sml:input name="particleMotion">
                   <swe:ObservableProperty definition="http://mmisw.org/ont/mvco/observableProperty/particleMotion">
-                     <gml:description></gml:description>
-                  </swe:ObservableProperty>
-               </sml:input>
-               <sml:input name="tilt">
-                  <swe:ObservableProperty definition="http://mmisw.org/ont/rdi/observableProperty/tilt">
-                     <gml:description>doppler backscatter</gml:description>
-                  </swe:ObservableProperty>
-               </sml:input>
-               <sml:input name="heading">
-                  <swe:ObservableProperty definition="http://mmisw.org/ont/rdi/observableProperty/heading">
                      <gml:description></gml:description>
                   </swe:ObservableProperty>
Index: q2o/sos_adcp/trunk/sos_adcp/RangeSeriesTest.xml
===================================================================
--- q2o/sos_adcp/trunk/sos_adcp/RangeSeriesTest.xml (revision 432)
+++ q2o/sos_adcp/trunk/sos_adcp/RangeSeriesTest.xml (revision 435)
@@ -7,15 +7,7 @@
     <member xlink:role="urn:x-ogc:def:sensor:OGC:processModel">
         <ProcessChain gml:id="RangeSeriesTest">
-            <gml:description>Checking for values in a time series and flagging them as bad if they fall outside the min/max parameters</gml:description>
+            <gml:description></gml:description>
             <gml:name>RangeSeriesTest</gml:name>
-            <classification>
-                <ClassifierList>
-                    <classifier name="processType">
-                        <Term definition="http://mmisw.org/ont/mvco/process">
-                            <value>http://mmisw.org/ont/mvco/process/rangeSeriesTest</value>
-                        </Term>
-                    </classifier>
-                </ClassifierList>
-            </classification>
+            <classification/>
             <inputs>
                 <InputList>
@@ -68,5 +60,5 @@
             <components>
                 <ComponentList>
-                    <component name="RangeTest" xlink:href="http://mvcodata.whoi.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.2/RangeTest.xml"/>
+                    <component name="RangeTest" xlink:href="http://mvcodata.whoi.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.1/RangeTest.xml"/>
                 </ComponentList>
             </components>
Index: q2o/sos_adcp/trunk/sos_adcp/SpikeTest.xml
===================================================================
--- q2o/sos_adcp/trunk/sos_adcp/SpikeTest.xml (revision 432)
+++ q2o/sos_adcp/trunk/sos_adcp/SpikeTest.xml (revision 435)
@@ -10,5 +10,6 @@
                 <ClassifierList>
                     <classifier name="processType">
-                        <Term definition="http://mmisw.org/ont/mvco/process">
+                        <Term definition="http://mmisw.org/ont/q2o/test/QcCategory">
+                            <codeSpace xlink:href="http://mmisw.org/ont/q2o/test/QcCategory"/>
                             <value>http://mmisw.org/ont/q2o/test/spikeTest</value>
                         </Term>
@@ -68,5 +69,5 @@
                 <ComponentList>
                     <component name="computeStdDev" xlink:href="urn:MVCO:process:ComputeStdDev"/>
-                    <component name="minThresholdTest" xlink:href="http://mvcodata.whoi.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.2/MinThresholdTest.xml"/>
+                    <component name="minThresholdTest" xlink:href="http://mvcodata.whoi.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.1/MinThresholdTest.xml"/>
                 </ComponentList>
             </components>
Index: q2o/sos_adcp/trunk/sos_adcp/TimeSeriesChain.xml
===================================================================
--- q2o/sos_adcp/trunk/sos_adcp/TimeSeriesChain.xml (revision 432)
+++ q2o/sos_adcp/trunk/sos_adcp/TimeSeriesChain.xml (revision 435)
@@ -1,24 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <sml:SensorML version="1.0.1" xmlns:gml="http://www.opengis.net/gml" xmlns:sml="http://www.opengis.net/sensorML/1.0.1" xmlns:swe="http://www.opengis.net/swe/1.0.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/sensorML/1.0.1 http://schemas.opengis.net/sensorML/1.0.1/sensorML.xsd">
-    <sml:member>
+    <sml:member xlink:href="">
         <sml:ProcessChain gml:id="TimeSeriesChain">
             <gml:description>Process Chain for MVCO TimeSeries data.  Can be used for both Velocity and pressure, depending on inputs</gml:description>
             <gml:name>TimeSeriesChain</gml:name>
-            
-            <sml:identification>
-                <sml:IdentifierList>
-                    <sml:identifier>
-                        <sml:Term>
-                            <sml:value></sml:value>
-                        </sml:Term>
-                    </sml:identifier>
-                </sml:IdentifierList>
-            </sml:identification>
-            
             <sml:classification>
                 <sml:ClassifierList>
                     <sml:classifier name="processType">
-                        <sml:Term definition="http://mmisw.org/ont/mvco/process">
-                            <sml:value>http://mmisw.org/ont/mvco/process/TimeSeriesChain</sml:value>
+                        <sml:Term definition="http://mmisw.org/ont/MVCO/...">
+                            <sml:codeSpace xlink:href="http://mmisw.org/ont/MVCO/..."/>
+                            <sml:value>http://mmisw.org/ont/MVCO/...</sml:value>
                         </sml:Term>
                     </sml:classifier>
@@ -109,9 +99,10 @@
             <sml:components>
                 <sml:ComponentList>
-                    <sml:component name="DataGapTest" xlink:href="http://mvcodata.whoi.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.2/DataGapTest.xml"/>
-                    <sml:component name="RangeSeriesTest" xlink:href="http://mvcodata.whoi.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.2/RangeSeriesTest.xml"/>
-                    <sml:component name="FlagOutliers" xlink:href="http://mvcodata.whoi.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.2/FlagOutliers.xml"/>
-                    <sml:component name="PercentPassed" xlink:href="http://mvcodata.whoi.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.2/PointsGoodTest.xml"/>
-                    <sml:component name="LinearInterpolation" xlink:href="http://mvcodata.whoi.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.2/LinearInterpolation.xml"/> <!-- TODO -->
+                    <sml:component name="MinRecordLengthTest" xlink:href="http://mvcodata.whoi.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.1/MinThresholdTest.xml"/> 
+                    <sml:component name="DataGapTest" xlink:href="http://mvcodata.whoi.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.1/DataGapTest.xml"/>
+                    <sml:component name="RangeSeriesTest" xlink:href="http://mvcodata.whoi.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.1/RangeSeriesTest.xml"/>
+                    <sml:component name="SpikeTest" xlink:href="http://mvcodata.whoi.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.1/SpikeTest.xml"/>
+                    <sml:component name="PercentPassed" xlink:href="http://mvcodata.whoi.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.1/PointsGoodTest.xml"/>
+                    <sml:component name="Interpolation" xlink:href="..."/> <!-- TODO -->
                 </sml:ComponentList>
             </sml:components>
@@ -171,5 +162,5 @@
                         <sml:Link>
                             <sml:source ref="RangeSeriesTest/outputs/timeSeriesData"/>
-                            <sml:destination ref="FlagOutliers/inputs/timeSeriesData"/>
+                            <sml:destination ref="SpikeTest/inputs/timeSeriesData"/>
                         </sml:Link>
                     </sml:connection>
@@ -177,5 +168,5 @@
                         <sml:Link>
                             <sml:source ref="this/parameters/spikeParams/iterations"/>
-                            <sml:destination ref="FlagOutliers/parameters/iterations"/>
+                            <sml:destination ref="SpikeTest/parameters/iterations"/>
                         </sml:Link>
                     </sml:connection>
@@ -183,10 +174,10 @@
                         <sml:Link>
                             <sml:source ref="this/parameters/spikeParams/numStdDeviations"/>
-                            <sml:destination ref="FlagOutliers/parameters/numStdDeviations"/>
-                        </sml:Link>
-                    </sml:connection>
-                    <sml:connection>
-                        <sml:Link>
-                            <sml:source ref="FlagOutliers/outputs/flaggedTimeSeriesData"/>
+                            <sml:destination ref="SpikeTest/parameters/numStdDeviations"/>
+                        </sml:Link>
+                    </sml:connection>
+                    <sml:connection>
+                        <sml:Link>
+                            <sml:source ref="SpikeTest/outputs/flaggedTimeSeriesData"/>
                             <sml:destination ref="PercentPassed/inputs/flaggedTimeSeriesData"/>
                         </sml:Link>
Index: q2o/sos_adcp/trunk/sos_adcp/Velocity_QC_Chain.xml
===================================================================
--- q2o/sos_adcp/trunk/sos_adcp/Velocity_QC_Chain.xml (revision 432)
+++ q2o/sos_adcp/trunk/sos_adcp/Velocity_QC_Chain.xml (revision 435)
@@ -6,5 +6,5 @@
     xsi:schemaLocation="http://www.opengis.net/sensorML/1.0.1 http://schemas.opengis.net/sensorML/1.0.1/sensorML.xsd"
     version="1.0.1">
-    <sml:member>
+    <sml:member xlink:href="">
         <sml:ProcessChain gml:id="Vel_QC_Chain">
             <gml:description>General Process Chain for ADCP data</gml:description>
@@ -13,6 +13,7 @@
                 <sml:ClassifierList>
                     <sml:classifier name="processType">
-                        <sml:Term definition="http://mmisw.org/ont/mvco/process">
-                            <sml:value>http://mmisw.org/ont/mvco/process/velocityQCchain.xml</sml:value>
+                        <sml:Term definition="http://mmisw.org/ont/MVCO/test/QcCategory">
+                            <sml:codeSpace xlink:href="http://mmisw.org/ont/MVCO/test/QcCategory"/>
+                            <sml:value>http://mmisw.org/ont/MVCO/process/Velocity_QC_Chain</sml:value>
                         </sml:Term>
                     </sml:classifier>
@@ -171,7 +172,7 @@
             <sml:components>
                 <sml:ComponentList>
-                    <sml:component name="BeamIntensityCheck" xlink:href="http://mvcodata.whoi.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.2/MinThresholdSeriesTest.xml"/>
-                    <sml:component name="CorrelationCoeffCheck" xlink:href="http://mvcodata.whoi.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.2/RangeSeriesTest.xml"/>
-                    <sml:component name="TimeSeriesChain" xlink:href="http://mvcodata.whoi.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.2/TimeSeriesChain.xml"/>
+                    <sml:component name="BeamIntensityCheck" xlink:href="http://mvcodata.whoi.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.1/MinThresholdSeriesTest.xml"/>
+                    <sml:component name="CorrelationCoeffCheck" xlink:href="http://mvcodata.whoi.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.1/RangeSeriesTest.xml"/>
+                    <sml:component name="TimeSeriesChain" xlink:href="http://mvcodata.whoi.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.1/TimeSeriesChain.xml"/>
                 </sml:ComponentList>
             </sml:components>
Index: q2o/sos_adcp/trunk/sos_adcp/Velocity_QC_Chain_Values.xml
===================================================================
--- q2o/sos_adcp/trunk/sos_adcp/Velocity_QC_Chain_Values.xml (revision 424)
+++ q2o/sos_adcp/trunk/sos_adcp/Velocity_QC_Chain_Values.xml (revision 435)
@@ -6,5 +6,5 @@
     xsi:schemaLocation="http://www.opengis.net/sensorML/1.0.1 http://schemas.opengis.net/sensorML/1.0.1/sensorML.xsd"
     version="1.0.1">
-    <sml:member>
+    <sml:member xlink:href="">
         <sml:ProcessChain gml:id="Vel_QC_Chain">
             <gml:description>General Process Chain for ADCP data</gml:description>
@@ -197,7 +197,7 @@
             <sml:components>
                 <sml:ComponentList>
-                    <sml:component name="BeamIntensityCheck" xlink:href="http://vast.uah.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.1/MinThresholdSeriesTest.xml"/>
-                    <sml:component name="CorrelationCoeffCheck" xlink:href="http://vast.uah.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.1/RangeSeriesTest_1.xml"/>
-                    <sml:component name="TimeSeriesChain" xlink:href="http://vast.uah.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.1/TimeSeriesChain.xml"/>
+                    <sml:component name="BeamIntensityCheck" xlink:href="http://mvcodata.whoi.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.1/MinThresholdSeriesTest.xml"/>
+                    <sml:component name="CorrelationCoeffCheck" xlink:href="http://mvcodata.whoi.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.1/RangeSeriesTest_1.xml"/>
+                    <sml:component name="TimeSeriesChain" xlink:href="http://mvcodata.whoi.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.1/TimeSeriesChain.xml"/>
                 </sml:ComponentList>
             </sml:components>
Index: q2o/sos_adcp/trunk/sos_adcp/Velocity_QC_Chain_Values_2.0.xml
===================================================================
--- q2o/sos_adcp/trunk/sos_adcp/Velocity_QC_Chain_Values_2.0.xml (revision 394)
+++ q2o/sos_adcp/trunk/sos_adcp/Velocity_QC_Chain_Values_2.0.xml (revision 435)
Index: q2o/sos_adcp/trunk/sos_adcp/adcpAllTemplate.xml
===================================================================
--- q2o/sos_adcp/trunk/sos_adcp/adcpAllTemplate.xml (revision 394)
+++ q2o/sos_adcp/trunk/sos_adcp/adcpAllTemplate.xml (revision 435)
Index: q2o/sos_adcp/trunk/sos_adcp/adcpPartialTemplate.xml
===================================================================
--- q2o/sos_adcp/trunk/sos_adcp/adcpPartialTemplate.xml (revision 394)
+++ q2o/sos_adcp/trunk/sos_adcp/adcpPartialTemplate.xml (revision 435)
Index: q2o/sos_adcp/trunk/sos_adcp/adcpQcTemplate.xml
===================================================================
--- q2o/sos_adcp/trunk/sos_adcp/adcpQcTemplate.xml (revision 394)
+++ q2o/sos_adcp/trunk/sos_adcp/adcpQcTemplate.xml (revision 435)
Index: q2o/sos_adcp/trunk/sos_adcp/capabilities.xml
===================================================================
--- q2o/sos_adcp/trunk/sos_adcp/capabilities.xml (revision 424)
+++ q2o/sos_adcp/trunk/sos_adcp/capabilities.xml (revision 435)
@@ -27,5 +27,5 @@
 	<ows:ServiceProvider>
 		<ows:ProviderName>University of Alabama in Huntsville, VAST</ows:ProviderName>
-		<ows:ProviderSite xlink:href="http://vastserver.nsstc.uah.edu"/>
+		<ows:ProviderSite xlink:href="http://www.whoi.edu"/>
 		<ows:ServiceContact>
 			<ows:IndividualName>Tony Cook</ows:IndividualName>
@@ -53,6 +53,6 @@
 			<ows:DCP>
 				<ows:HTTP>
-					<ows:Get xlink:href="http://vastserver.nsstc.uah.edu/vastGC/adcp"/>
-					<ows:Post xlink:href="http://vastserver.nsstc.uah.edu/vastGC/adcp"/>
+					<ows:Get xlink:href="http://mvcodata.whoi.edu/q2o/adcp"/>
+					<ows:Post xlink:href="http://mvcodata.whoi.edu/q2o/adcp"/>
 				</ows:HTTP>
 			</ows:DCP>
@@ -71,6 +71,6 @@
 			<ows:DCP>
 				<ows:HTTP>
-					<ows:Get xlink:href="http://vastserver.nsstc.uah.edu/vastGC/adcp"/>
-					<ows:Post xlink:href="http://vastserver.nsstc.uah.edu/vastGC/adcp"/>					
+					<ows:Get xlink:href="http://mvcodata.whoi.edu/q2o/adcp"/>
+					<ows:Post xlink:href="http://mvcodata.whoi.edu/q2o/adcp"/>					
 				</ows:HTTP>
 			</ows:DCP>
@@ -107,4 +107,5 @@
 				<ows:AllowedValues>
 					<ows:Value>ADCP_DATA</ows:Value>
+					<ows:Value>ADCP_DATA</ows:Value>
 					<ows:Value>ADCP_DATA_QC</ows:Value>
 					<ows:Value>PRESSURE_ALL</ows:Value>
@@ -112,5 +113,4 @@
 					<ows:Value>VELOCITY_ALL</ows:Value>
 					<ows:Value>VELOCITY_QC</ows:Value>
-					<ows:Value>QC_PARAMS</ows:Value>
 				</ows:AllowedValues>
 			</ows:Parameter>
@@ -119,19 +119,19 @@
 			<ows:DCP>
 				<ows:HTTP>
-					<ows:Get xlink:href="http://vastserver.nsstc.uah.edu/vastGC/adcp"/>
-					<ows:Post xlink:href="http://vastserver.nsstc.uah.edu/vastGC/adcp"/>					
+					<ows:Get xlink:href="http://mvcodata.whoi.edu/q2o/adcp"/>
+					<ows:Post xlink:href="http://mvcodata.whoi.edu/q2o/adcp"/>					
 				</ows:HTTP>
 			</ows:DCP>
 			<ows:Parameter name="procedure">
 				<ows:AllowedValues>
-					<ows:Value>http://vastserver.nsstc.uah.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.1/MVCO_ObservingSystem.xml</ows:Value>
-					<ows:Value>http://vastserver.nsstc.uah.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.1/ADCP_System.xml</ows:Value>
-					<ows:Value>http://vastserver.nsstc.uah.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.1/MVCO_Workhorse_1200.xml</ows:Value>
-					<ows:Value>http://vastserver.nsstc.uah.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.1/RDI_Workhorse_1200.xml</ows:Value>
-					<ows:Value>http://vastserver.nsstc.uah.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.1/Pressure_Obs_Process.xml</ows:Value>
-					<ows:Value>http://vastserver.nsstc.uah.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.1/Velocity_Obs_Process.xml</ows:Value>
-					<ows:Value>http://vastserver.nsstc.uah.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.1/Pressure_QC_Chain.xml</ows:Value>
-					<ows:Value>http://vastserver.nsstc.uah.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.1/Velocity_QC_Chain.xml</ows:Value>
-					<ows:Value>http://vastserver.nsstc.uah.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.1/PUV_Analysis.xml</ows:Value>
+					<ows:Value>http://mvcodata.whoi.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.1/MVCO_ObservingSystem.xml</ows:Value>
+					<ows:Value>http://mvcodata.whoi.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.1/ADCP_System.xml</ows:Value>
+					<ows:Value>http://mvcodata.whoi.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.1/MVCO_Workhorse_1200.xml</ows:Value>
+					<ows:Value>http://mvcodata.whoi.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.1/RDI_Workhorse_1200.xml</ows:Value>
+					<ows:Value>http://mvcodata.whoi.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.1/Pressure_Obs_Process.xml</ows:Value>
+					<ows:Value>http://mvcodata.whoi.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.1/Velocity_Obs_Process.xml</ows:Value>
+					<ows:Value>http://mvcodata.whoi.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.1/Pressure_QC_Chain.xml</ows:Value>
+					<ows:Value>http://mvcodata.whoi.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.1/Velocity_QC_Chain.xml</ows:Value>
+					<ows:Value>http://mvcodata.whoi.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.1/PUV_Analysis.xml</ows:Value>
 				</ows:AllowedValues>
 			</ows:Parameter>
@@ -159,29 +159,29 @@
 					</gml:TimePeriod>
 				</sos:time>
-				<sos:procedure xlink:href="http://vastserver.nsstc.uah.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.1/ADCP_System.xml">
-					<swe:internalInfo>
-						<swe:Parameters>
-							<swe:sensorMLUrl xlink:href="http://vastserver.nsstc.uah.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.1/ADCP_System.xml"/>
-						</swe:Parameters>
-					</swe:internalInfo>
-				</sos:procedure>
-				<sos:procedure xlink:href="http://vastserver.nsstc.uah.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.1/MVCO_Workhorse_1200.xml">
-					<swe:internalInfo>
-						<swe:Parameters>
-							<swe:sensorMLUrl xlink:href="http://vastserver.nsstc.uah.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.1/MVCO_Workhorse_1200.xml"/>
+				<sos:procedure xlink:href="http://mvcodata.whoi.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.1/ADCP_System.xml">
+					<swe:internalInfo>
+						<swe:Parameters>
+							<swe:sensorMLUrl xlink:href="http://mvcodata.whoi.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.1/ADCP_System.xml"/>
+						</swe:Parameters>
+					</swe:internalInfo>
+				</sos:procedure>
+				<sos:procedure xlink:href="http://mvcodata.whoi.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.1/MVCO_Workhorse_1200.xml">
+					<swe:internalInfo>
+						<swe:Parameters>
+							<swe:sensorMLUrl xlink:href="http://mvcodata.whoi.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.1/MVCO_Workhorse_1200.xml"/>
 						</swe:Parameters>
 					</swe:internalInfo>
 				</sos:procedure>	
-				<sos:procedure xlink:href="http://vastserver.nsstc.uah.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.1/RDI_Workhorse_1200.xml">
-					<swe:internalInfo>
-						<swe:Parameters>
-							<swe:sensorMLUrl xlink:href="http://vastserver.nsstc.uah.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.1/RDI_Workhorse_1200.xml"/>
-						</swe:Parameters>
-					</swe:internalInfo>
-				</sos:procedure>
-				<sos:procedure xlink:href="http://vastserver.nsstc.uah.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.1/PUV_Analysis.xml">
-					<swe:internalInfo>
-						<swe:Parameters>
-							<swe:sensorMLUrl xlink:href="http://vastserver.nsstc.uah.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.1/PUV_Analysis.xml"/>
+				<sos:procedure xlink:href="http://mvcodata.whoi.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.1/RDI_Workhorse_1200.xml">
+					<swe:internalInfo>
+						<swe:Parameters>
+							<swe:sensorMLUrl xlink:href="http://mvcodata.whoi.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.1/RDI_Workhorse_1200.xml"/>
+						</swe:Parameters>
+					</swe:internalInfo>
+				</sos:procedure>
+				<sos:procedure xlink:href="http://mvcodata.whoi.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.1/PUV_Analysis.xml">
+					<swe:internalInfo>
+						<swe:Parameters>
+							<swe:sensorMLUrl xlink:href="http://mvcodata.whoi.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.1/PUV_Analysis.xml"/>
 						</swe:Parameters>
 					</swe:internalInfo>
@@ -258,5 +258,5 @@
 					</gml:TimePeriod>
 				</sos:time>
-				<sos:procedure xlink:href="http://vastserver.nsstc.uah.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.1/ADCP_System.xml"/>				
+				<sos:procedure xlink:href="http://mvcodata.whoi.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.1/ADCP_System.xml"/>				
 				<sos:observedProperty>
 					<swe:CompositePhenomenon gml:id="ALL_DATA_QC" dimension="19">
@@ -304,8 +304,8 @@
 					</gml:TimePeriod>
 				</sos:time>
-				<sos:procedure xlink:href="http://vastserver.nsstc.uah.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.1/Pressure_Obs_Process.xml">
-					<swe:internalInfo>
-						<swe:Parameters>
-							<swe:sensorMLUrl xlink:href="http://vastserver.nsstc.uah.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.1/Pressure_Obs_Process.xml"/>
+				<sos:procedure xlink:href="http://mvcodata.whoi.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.1/Pressure_Obs_Process.xml">
+					<swe:internalInfo>
+						<swe:Parameters>
+							<swe:sensorMLUrl xlink:href="http://mvcodata.whoi.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.1/Pressure_Obs_Process.xml"/>
 						</swe:Parameters>
 					</swe:internalInfo>
@@ -346,8 +346,8 @@
 					</gml:TimePeriod>
 				</sos:time>
-				<sos:procedure xlink:href="http://vastserver.nsstc.uah.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.1/Pressure_QC_Chain.xml">
-					<swe:internalInfo>
-						<swe:Parameters>
-							<swe:sensorMLUrl xlink:href="http://vastserver.nsstc.uah.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.1/Pressure_QC_Chain.xml"/>
+				<sos:procedure xlink:href="http://mvcodata.whoi.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.1/Pressure_QC_Chain.xml">
+					<swe:internalInfo>
+						<swe:Parameters>
+							<swe:sensorMLUrl xlink:href="http://mvcodata.whoi.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.1/Pressure_QC_Chain.xml"/>
 						</swe:Parameters>
 					</swe:internalInfo>
@@ -388,8 +388,8 @@
 					</gml:TimePeriod>
 				</sos:time>
-				<sos:procedure xlink:href="http://vastserver.nsstc.uah.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.1/Velocity_Obs_Proces.xml">
-					<swe:internalInfo>
-						<swe:Parameters>
-							<swe:sensorMLUrl xlink:href="http://vastserver.nsstc.uah.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.1/Velocity_Obs_Process.xml"/>
+				<sos:procedure xlink:href="http://mvcodata.whoi.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.1/Velocity_Obs_Proces.xml">
+					<swe:internalInfo>
+						<swe:Parameters>
+							<swe:sensorMLUrl xlink:href="http://mvcodata.whoi.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.1/Velocity_Obs_Process.xml"/>
 						</swe:Parameters>
 					</swe:internalInfo>
@@ -437,8 +437,8 @@
 					</gml:TimePeriod>
 				</sos:time>
-				<sos:procedure xlink:href="http://vastserver.nsstc.uah.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.1/Velocity_QC_Chain.xml">
-					<swe:internalInfo>
-						<swe:Parameters>
-							<swe:sensorMLUrl xlink:href="http://vastserver.nsstc.uah.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.1/Velocity_QC_Chain.xml"/>
+				<sos:procedure xlink:href="http://mvcodata.whoi.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.1/Velocity_QC_Chain.xml">
+					<swe:internalInfo>
+						<swe:Parameters>
+							<swe:sensorMLUrl xlink:href="http://mvcodata.whoi.edu/downloads/sensorML/v1.0/examples/sensors/ADCP_2.1/Velocity_QC_Chain.xml"/>
 						</swe:Parameters>
 					</swe:internalInfo>
@@ -473,5 +473,5 @@
 					values were used to create the ObservcationOfferings available from the MVCO ADCP SOS.
 					Paramter names should match paramter names in the ProcessChains files.  
-   				    Eventual goal is for the UAH SensorML processsing engine to dynamically take these values
+   				    Eventual goal is for the UAH SesnorML processsing engine to dynamically take these values
    				    and perform QC processing on the fly.)</gml:description>
 				<gml:name>MVCO ADCP Velocity</gml:name>
Index: q2o/sos_adcp/trunk/sos_adcp/pressureAllTemplate.xml
===================================================================
--- q2o/sos_adcp/trunk/sos_adcp/pressureAllTemplate.xml (revision 394)
+++ q2o/sos_adcp/trunk/sos_adcp/pressureAllTemplate.xml (revision 435)
Index: q2o/sos_adcp/trunk/sos_adcp/pressureQCTemplate.xml
===================================================================
--- q2o/sos_adcp/trunk/sos_adcp/pressureQCTemplate.xml (revision 394)
+++ q2o/sos_adcp/trunk/sos_adcp/pressureQCTemplate.xml (revision 435)
Index: q2o/sos_adcp/trunk/sos_adcp/velocityAllTemplate.xml
===================================================================
--- q2o/sos_adcp/trunk/sos_adcp/velocityAllTemplate.xml (revision 394)
+++ q2o/sos_adcp/trunk/sos_adcp/velocityAllTemplate.xml (revision 435)
Index: q2o/sos_adcp/trunk/sos_adcp/velocityQCTemplate.xml
===================================================================
--- q2o/sos_adcp/trunk/sos_adcp/velocityQCTemplate.xml (revision 394)
+++ q2o/sos_adcp/trunk/sos_adcp/velocityQCTemplate.xml (revision 435)