diff --git a/asterix-app/src/test/resources/integration/queries/dataset-scan.aql b/asterix-app/src/test/resources/integration/queries/dataset-scan.aql
index 5e3318f..38262b9 100644
--- a/asterix-app/src/test/resources/integration/queries/dataset-scan.aql
+++ b/asterix-app/src/test/resources/integration/queries/dataset-scan.aql
@@ -35,7 +35,7 @@
   city: string
 }
 
-declare nodegroup group1 on nc1, nc2;
+declare nodegroup group1 on asterix_nc1, asterix_nc2;
 
 declare dataset Customers(CustomerType) 
   primary key cid on group1;
diff --git a/asterix-app/src/test/resources/integration/queries/retrecord.aql b/asterix-app/src/test/resources/integration/queries/retrecord.aql
index 3636d8d..997eafd 100644
--- a/asterix-app/src/test/resources/integration/queries/retrecord.aql
+++ b/asterix-app/src/test/resources/integration/queries/retrecord.aql
@@ -19,8 +19,8 @@
 declare function samecust($cust, $ord)
 {$cust.cid = $ord.cid}
 
-for $c in recordset(['cid', 'int32', 'name', 'string', 'age', 'int32'], 'osfiles', ['nc1', 'data/spj01/cust1.adm'], ['nc2', 'data/spj01/cust2.adm'])
-for $o in recordset(['oid', 'int32', 'date', 'int32', 'cid', 'int32', 'total', 'float'], 'osfiles', ['nc1', 'data/spj01/ord1.adm'], ['nc2', 'data/spj01/ord2.adm'])
+for $c in recordset(['cid', 'int32', 'name', 'string', 'age', 'int32'], 'osfiles', ['asterix_nc1', 'data/spj01/cust1.adm'], ['asterix_nc2', 'data/spj01/cust2.adm'])
+for $o in recordset(['oid', 'int32', 'date', 'int32', 'cid', 'int32', 'total', 'float'], 'osfiles', ['asterix_nc1', 'data/spj01/ord1.adm'], ['asterix_nc2', 'data/spj01/ord2.adm'])
 where samecust($c, $o)
 return { "customer":$c, "order":$o } 
 
diff --git a/asterix-app/src/test/resources/integration/queries/underpayment1-recordset.aql b/asterix-app/src/test/resources/integration/queries/underpayment1-recordset.aql
index a18a66c..c599ffc 100644
--- a/asterix-app/src/test/resources/integration/queries/underpayment1-recordset.aql
+++ b/asterix-app/src/test/resources/integration/queries/underpayment1-recordset.aql
@@ -16,8 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-for $p in recordset(['pid', 'int32', 'oid', 'int32', 'value', 'float'], 'osfiles', ['nc1', 'data/spj01/payment1.adm'], ['nc2', 'data/spj01/payment2.adm'])
-for $o in recordset(['oid', 'int32', 'date', 'int32', 'cid', 'int32', 'total', 'float'], 'osfiles', ['nc1', 'data/spj01/ord1.adm'], ['nc2', 'data/spj01/ord2.adm'])
+for $p in recordset(['pid', 'int32', 'oid', 'int32', 'value', 'float'], 'osfiles', ['asterix_nc1', 'data/spj01/payment1.adm'], ['asterix_nc2', 'data/spj01/payment2.adm'])
+for $o in recordset(['oid', 'int32', 'date', 'int32', 'cid', 'int32', 'total', 'float'], 'osfiles', ['asterix_nc1', 'data/spj01/ord1.adm'], ['asterix_nc2', 'data/spj01/ord2.adm'])
 where $o.oid = $p.oid and $o.total > $p.value
 return 
 { "order-id": $o.oid, "balance": $o.total - $p.value }
diff --git a/asterix-app/src/test/resources/integration/updates/load-dataset.aql b/asterix-app/src/test/resources/integration/updates/load-dataset.aql
index 1cfed34..48bb41a 100644
--- a/asterix-app/src/test/resources/integration/updates/load-dataset.aql
+++ b/asterix-app/src/test/resources/integration/updates/load-dataset.aql
@@ -30,11 +30,11 @@
   city: string
 }
 
-declare nodegroup group1 on nc1, nc2;
+declare nodegroup group1 on asterix_nc1, asterix_nc2;
 
 declare dataset Customers(CustomerType) 
   primary key cid on group1;
 
 load dataset Customers 
 using "org.apache.asterix.external.dataset.adapter.NCFileSystemAdapter"
-(("path"="nc1://data/spj01/cust1.adm"),("format"="adm")) pre-sorted;
+(("path"="asterix_nc1://data/spj01/cust1.adm"),("format"="adm")) pre-sorted;