diff -up bes-3.16.0/modules/dap-server/www-interface/WWWGrid.cc.gcc6 bes-3.16.0/modules/dap-server/www-interface/WWWGrid.cc
--- bes-3.16.0/modules/dap-server/www-interface/WWWGrid.cc.gcc6	2015-09-17 16:53:24.000000000 -0600
+++ bes-3.16.0/modules/dap-server/www-interface/WWWGrid.cc	2016-02-04 14:06:06.417929238 -0700
@@ -66,7 +66,7 @@ WWWGrid::WWWGrid(Grid * grid): Grid(grid
 {
     BaseType *bt = basetype_to_wwwtype(grid->array_var());
     bt->set_attr_table(grid->array_var()->get_attr_table());
-    add_var(bt, array);
+    add_var(bt, libdap::array);
     delete bt;
 
     Grid::Map_iter i = grid->map_begin();
diff -up bes-3.16.0/modules/fileout_netcdf/unit-tests/gridT.cc.gcc6 bes-3.16.0/modules/fileout_netcdf/unit-tests/gridT.cc
--- bes-3.16.0/modules/fileout_netcdf/unit-tests/gridT.cc.gcc6	2015-10-23 16:44:52.000000000 -0600
+++ bes-3.16.0/modules/fileout_netcdf/unit-tests/gridT.cc	2016-02-04 14:20:27.287379692 -0700
@@ -106,7 +106,7 @@ int main(int argc, char **argv)
             btv.push_back(10);
             btv.push_back(15);
             a.set_value(btv, 6);
-            order.add_var(&a, array);
+            order.add_var(&a, libdap::array);
         }
         {
             Int32 bt("shot");
@@ -121,7 +121,7 @@ int main(int argc, char **argv)
             btv.push_back(14);
             btv.push_back(21);
             a.set_value(btv, 6);
-            shot.add_var(&a, array);
+            shot.add_var(&a, libdap::array);
         }
         {
             Int32 bt("bears");
@@ -138,7 +138,7 @@ int main(int argc, char **argv)
             btv.push_back(27);
             btv.push_back(36);
             a.set_value(btv, 8);
-            bears.add_var(&a, array);
+            bears.add_var(&a, libdap::array);
         }
         order.set_read_p(true);
         dds->add_var(&order);
diff -up bes-3.16.0/modules/fileout_netcdf/unit-tests/namesT.cc.gcc6 bes-3.16.0/modules/fileout_netcdf/unit-tests/namesT.cc
--- bes-3.16.0/modules/fileout_netcdf/unit-tests/namesT.cc.gcc6	2015-10-23 16:55:08.000000000 -0600
+++ bes-3.16.0/modules/fileout_netcdf/unit-tests/namesT.cc	2016-02-04 14:20:48.599881529 -0700
@@ -90,7 +90,7 @@ int main(int argc, char **argv)
             btv.push_back(10);
             btv.push_back(15);
             a.set_value(btv, 6);
-            order.add_var(&a, array);
+            order.add_var(&a, libdap::array);
         }
         order.set_read_p(true);
         dds->add_var(&order);
diff -up bes-3.16.0/modules/gdal_handler/gdal_dds.cc.gcc6 bes-3.16.0/modules/gdal_handler/gdal_dds.cc
--- bes-3.16.0/modules/gdal_handler/gdal_dds.cc.gcc6	2015-01-14 14:32:41.000000000 -0700
+++ bes-3.16.0/modules/gdal_handler/gdal_dds.cc	2016-02-04 14:21:08.407206675 -0700
@@ -147,7 +147,7 @@ GDALDatasetH gdal_read_dataset_variables
         ar->append_dim( GDALGetRasterYSize( hDS ), "northing" );
         ar->append_dim( GDALGetRasterXSize( hDS ), "easting" );
 
-        grid->add_var_nocopy( ar, array );
+        grid->add_var_nocopy( ar, libdap::array );
 
 /* -------------------------------------------------------------------- */
 /*      Add the dimension map arrays.                                   */
diff -up bes-3.16.0/modules/hdf4_handler/hc2dap.cc.gcc6 bes-3.16.0/modules/hdf4_handler/hc2dap.cc
--- bes-3.16.0/modules/hdf4_handler/hc2dap.cc.gcc6	2014-12-30 17:55:58.000000000 -0700
+++ bes-3.16.0/modules/hdf4_handler/hc2dap.cc	2016-02-04 14:19:16.329050019 -0700
@@ -318,7 +318,7 @@ HDFGrid *NewGridFromSDS(const hdf_sds &
     BaseType *dsbt = 0;
     try {
         gr = new HDFGrid(sds.name, dataset);
-        gr->add_var(ar, array); // note: gr now manages ar
+        gr->add_var(ar, libdap::array); // note: gr now manages ar
         delete ar;
 
         // create dimension scale HDFArrays (i.e., maps) and
diff -up bes-3.16.0/modules/netcdf_handler/ncdds.cc.gcc6 bes-3.16.0/modules/netcdf_handler/ncdds.cc
--- bes-3.16.0/modules/netcdf_handler/ncdds.cc.gcc6	2015-09-09 09:45:36.000000000 -0600
+++ bes-3.16.0/modules/netcdf_handler/ncdds.cc	2016-02-04 14:18:26.058148807 -0700
@@ -170,7 +170,7 @@ static Grid *build_grid(Array *ar, int n
 
     const string &filename = ar->dataset();
     Grid *gr = new NCGrid(ar->name(), filename);
-    gr->add_var(ar, array);
+    gr->add_var(ar, libdap::array);
 
     // Build and add BaseType/Array instances for the maps
     for (int d = 0; d < ndims; ++d) {
diff -up bes-3.16.0/modules/xml_data_handler/XDGrid.cc.gcc6 bes-3.16.0/modules/xml_data_handler/XDGrid.cc
--- bes-3.16.0/modules/xml_data_handler/XDGrid.cc.gcc6	2014-12-30 17:59:01.000000000 -0700
+++ bes-3.16.0/modules/xml_data_handler/XDGrid.cc	2016-02-04 14:19:37.904582733 -0700
@@ -64,7 +64,7 @@ XDGrid::XDGrid(Grid *grid) :
     Grid(grid->name()), XDOutput(grid)
 {
     BaseType *bt = basetype_to_xd(grid->array_var());
-    add_var(bt, array);
+    add_var(bt, libdap::array);
     // add_var makes a copy of the base type passed to it, so delete it here
     delete bt;
     bt = 0;