diff --git a/cave/com.raytheon.uf.viz.d2d.ui.obs/plugin.xml b/cave/com.raytheon.uf.viz.d2d.ui.obs/plugin.xml
index 4d468cedec..0fdbcd94ba 100644
--- a/cave/com.raytheon.uf.viz.d2d.ui.obs/plugin.xml
+++ b/cave/com.raytheon.uf.viz.d2d.ui.obs/plugin.xml
@@ -29,7 +29,7 @@
                     </reference>
                 </visibleWhen>
                 <separator name="SURFACE" visible="true" />
-				<separator name="USGS" visible="true" />
+				<separator name="streamflow" visible="true" />
 				<separator name="HAZARDS" visible="true" />
 				<separator name="CollectionDissemination" visible="true" />
                 <separator name="USPLNPLACEHOLDER" visible="true" />
diff --git a/cave/com.raytheon.uf.viz.d2d.xy.adapters/META-INF/MANIFEST.MF b/cave/com.raytheon.uf.viz.d2d.xy.adapters/META-INF/MANIFEST.MF
index 124504e8fa..d3af51af28 100644
--- a/cave/com.raytheon.uf.viz.d2d.xy.adapters/META-INF/MANIFEST.MF
+++ b/cave/com.raytheon.uf.viz.d2d.xy.adapters/META-INF/MANIFEST.MF
@@ -34,7 +34,7 @@ Require-Bundle: com.raytheon.uf.viz.core;bundle-version="1.14.0",
  com.raytheon.uf.common.dataplugin.obs;bundle-version="1.14.0",
  com.raytheon.uf.common.dataplugin.poessounding;bundle-version="1.14.0",
  com.raytheon.uf.common.dataplugin.profiler;bundle-version="1.14.0",
- edu.ucar.unidata.common.dataplugin.usgs;bundle-version="1.0.0"
+ edu.ucar.unidata.common.dataplugin.streamflow;bundle-version="1.0.0"
 Import-Package: com.raytheon.uf.common.inventory.exception,
  com.raytheon.uf.viz.datacube,
  com.raytheon.viz.core.map
diff --git a/cave/com.raytheon.uf.viz.d2d.xy.adapters/plugin.xml b/cave/com.raytheon.uf.viz.d2d.xy.adapters/plugin.xml
index df8d03a19c..95014d6d6e 100644
--- a/cave/com.raytheon.uf.viz.d2d.xy.adapters/plugin.xml
+++ b/cave/com.raytheon.uf.viz.d2d.xy.adapters/plugin.xml
@@ -94,7 +94,7 @@
       </timeSeriesAdapter>
       <timeSeriesAdapter
             adapter="com.raytheon.uf.viz.d2d.xy.adapters.timeseries.PointDataTimeSeriesAdapter"
-            class="edu.ucar.unidata.common.dataplugin.usgs.StreamflowRecord"
+            class="edu.ucar.unidata.common.dataplugin.streamflow.StreamflowRecord"
             name="Streamflow Time Series Adapter">
       </timeSeriesAdapter>
       <timeSeriesAdapter