diff --git a/data-discovery/src/main/java/search/DbPSearch.java b/data-discovery/src/main/java/search/DbObstap.java
similarity index 99%
rename from data-discovery/src/main/java/search/DbPSearch.java
rename to data-discovery/src/main/java/search/DbObstap.java
index 681835e1eae2a7a8225a18b25bf50abd612e520e..d6851d4173a16bf0706403df103c5fad3147a5e5 100644
--- a/data-discovery/src/main/java/search/DbPSearch.java
+++ b/data-discovery/src/main/java/search/DbObstap.java
@@ -21,13 +21,13 @@ import java.lang.ClassNotFoundException;
 
 import vo.parameter.*;
 
-public class DbPSearch
+public class DbObstap
 {
-   private static final Logger LOGGER = Logger.getLogger(DbPSearch.class.getName());
+   private static final Logger LOGGER = Logger.getLogger(DbObstap.class.getName());
    private DbConnArgs dbConnArgs;
 
 
-   DbPSearch(DbConnArgs dbConnArgs)
+   DbObstap(DbConnArgs dbConnArgs)
    {
       this.dbConnArgs = dbConnArgs;
    }
diff --git a/data-discovery/src/main/java/webapi/SearchServlet.java b/data-discovery/src/main/java/webapi/SearchServlet.java
index 7b0b49c55c0f0a3fd7dfaf6af544241d8311b03b..537dee8b5c32023dff8de9e53f73603334d77490 100644
--- a/data-discovery/src/main/java/webapi/SearchServlet.java
+++ b/data-discovery/src/main/java/webapi/SearchServlet.java
@@ -78,12 +78,12 @@ public class SearchServlet extends javax.servlet.http.HttpServlet
 
          /* query Obscore table */
 
-         DbPSearch dbps;
-         synchronized(DbPSearch.class)
+         DbObstap dbObstap;
+         synchronized(DbObstap.class)
          {
-            dbps = new DbPSearch(settings.dbConnArgs);
+            dbObstap = new DbObstap(settings.dbConnArgs);
          }
-         String[] pubdidArr = dbps.queryOverlapingPubdid(qArgs);
+         String[] pubdidArr = dbObstap.queryOverlapingPubdid(qArgs);
 
          LOGGER.info("Found " + pubdidArr.length + " records");
 
diff --git a/data-discovery/src/main/java/webapi/formatfilter/FormatResponseFilter.java b/data-discovery/src/main/java/webapi/formatfilter/FormatResponseFilter.java
index c6b5dfc3e054f56dc9856ac4cf750805a5ebe1ed..be53ad94f160923d252a369f43dda2c91353d01d 100644
--- a/data-discovery/src/main/java/webapi/formatfilter/FormatResponseFilter.java
+++ b/data-discovery/src/main/java/webapi/formatfilter/FormatResponseFilter.java
@@ -64,7 +64,7 @@ public class FormatResponseFilter implements Filter
             Pos  pos  = Pos.parsePos(params, DEFAULT_SKY_SYSTEM);
             Band band = Band.parseBand(params, DEFAULT_SPEC_SYSTEM);
 
-            DbPSearch.ObsCore[] obsCoreArr = queryObsCore(responseWrapper.getDbConnArgs(), pubdidArr, pos, band);
+            DbObstap.ObsCore[] obsCoreArr = queryObsCore(responseWrapper.getDbConnArgs(), pubdidArr, pos, band);
 
             String respFormat;
             String respFormatReq[] = params.get("RESPONSEFORMAT");
@@ -150,19 +150,19 @@ public class FormatResponseFilter implements Filter
    }
 
 
-   private DbPSearch.ObsCore[] queryObsCore(DbConnArgs dbConnArgs, String[] pubdidArr, Pos pos, Band band)
+   private DbObstap.ObsCore[] queryObsCore(DbConnArgs dbConnArgs, String[] pubdidArr, Pos pos, Band band)
          throws Exception
       {
 
          LOGGER.fine("trace");
 
-         DbPSearch dbps;
-         synchronized(DbPSearch.class)
+         DbObstap dbObstap;
+         synchronized(DbObstap.class)
          {
-            dbps = new DbPSearch(dbConnArgs);
+            dbObstap = new DbObstap(dbConnArgs);
          }
 
-         return dbps.queryOutputData(pubdidArr, pos, band);
+         return dbObstap.queryOutputData(pubdidArr, pos, band);
       }
 
 }
diff --git a/data-discovery/src/main/java/webapi/formatfilter/ObscoreExt.java b/data-discovery/src/main/java/webapi/formatfilter/ObscoreExt.java
index aeaa5838b938ea219e9ca03cc203fc97db09f01b..e847b5f3985d82d29cad3a48d52636e538e93fd8 100644
--- a/data-discovery/src/main/java/webapi/formatfilter/ObscoreExt.java
+++ b/data-discovery/src/main/java/webapi/formatfilter/ObscoreExt.java
@@ -75,7 +75,7 @@ class ObscoreExt
       new ColumnInfo( "instrument_name", String.class, "Instrument" ),
    };
 
-   public static Object[] obscoreRow( DbPSearch.ObsCore obsCore )
+   public static Object[] obscoreRow( DbObstap.ObsCore obsCore )
    {
       return new Object[]
       {
@@ -138,7 +138,7 @@ class ObscoreExt
       new ColumnInfo( "vel_max",    Double.class, "Velocity max" ),
    };
 
-   public static Object[] vlkbRow( DbPSearch.ObsCore obsCore )
+   public static Object[] vlkbRow( DbObstap.ObsCore obsCore )
    {
       return new Object[]
       {
@@ -157,7 +157,7 @@ class ObscoreExt
 
    public static final ColumnInfo[] OBSCORE_VLKB_COLINFO = concat(OBSCORE_COLINFO, VLKB_COLINFO);
 
-   public static Object[] obscoreVlkbRow( DbPSearch.ObsCore obsCore )
+   public static Object[] obscoreVlkbRow( DbObstap.ObsCore obsCore )
    {
       return concat(obscoreRow(obsCore),vlkbRow(obsCore));
    }
diff --git a/data-discovery/src/main/java/webapi/formatfilter/XmlSerializer.java b/data-discovery/src/main/java/webapi/formatfilter/XmlSerializer.java
index f3fe12f4907473cfb820f318a55e5c6b943cfb70..e54e8771cf1607d33ca3bdc7eab4d4b47f547e02 100644
--- a/data-discovery/src/main/java/webapi/formatfilter/XmlSerializer.java
+++ b/data-discovery/src/main/java/webapi/formatfilter/XmlSerializer.java
@@ -22,7 +22,7 @@ final class XmlSerializer
 
    public static void serializeToVoTable(
          PrintWriter writer, String charEncoding,
-         DbPSearch.ObsCore[] obsCoreArr,
+         DbObstap.ObsCore[] obsCoreArr,
          String cutoutUrl,
          boolean showDuration, long startTime_msec) throws IOException
    {