diff --git a/asterix-app/src/test/resources/demo0927/local/create-index.aql b/asterix-app/src/test/resources/demo0927/local/create-index.aql
index 186c66e..d14e965 100644
--- a/asterix-app/src/test/resources/demo0927/local/create-index.aql
+++ b/asterix-app/src/test/resources/demo0927/local/create-index.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/demo0927/local/dataset-filter-int.aql b/asterix-app/src/test/resources/demo0927/local/dataset-filter-int.aql
index 9722aa1..dfd4d1f 100644
--- a/asterix-app/src/test/resources/demo0927/local/dataset-filter-int.aql
+++ b/asterix-app/src/test/resources/demo0927/local/dataset-filter-int.aql
@@ -35,12 +35,12 @@
   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;
 
-write output to nc1:"/tmp/mycustomers.adm";
+write output to asterix_nc1:"/tmp/mycustomers.adm";
 
 for $c in dataset('Customers')
 where $c.age < 21 
diff --git a/asterix-app/src/test/resources/demo0927/local/dataset-filter-str.aql b/asterix-app/src/test/resources/demo0927/local/dataset-filter-str.aql
index 9a3a955..dea955e 100644
--- a/asterix-app/src/test/resources/demo0927/local/dataset-filter-str.aql
+++ b/asterix-app/src/test/resources/demo0927/local/dataset-filter-str.aql
@@ -35,12 +35,12 @@
   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;
 
-write output to nc1:"/tmp/mycustomers.adm";
+write output to asterix_nc1:"/tmp/mycustomers.adm";
 
 for $c in dataset('Customers')
 where $c.name = 'Noreen Doe' 
diff --git a/asterix-app/src/test/resources/demo0927/local/dataset-scan.aql b/asterix-app/src/test/resources/demo0927/local/dataset-scan.aql
index 9a241d3..47905c5 100644
--- a/asterix-app/src/test/resources/demo0927/local/dataset-scan.aql
+++ b/asterix-app/src/test/resources/demo0927/local/dataset-scan.aql
@@ -35,12 +35,12 @@
   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;
 
-write output to nc1:"/tmp/mycustomers.adm";
+write output to asterix_nc1:"/tmp/mycustomers.adm";
 
 for $c in dataset('Customers')
 return $c
diff --git a/asterix-app/src/test/resources/demo0927/local/declare-index.aql b/asterix-app/src/test/resources/demo0927/local/declare-index.aql
index 176176c..df13f9b 100644
--- a/asterix-app/src/test/resources/demo0927/local/declare-index.aql
+++ b/asterix-app/src/test/resources/demo0927/local/declare-index.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/demo0927/local/join-cust-ord.aql b/asterix-app/src/test/resources/demo0927/local/join-cust-ord.aql
index f2d8c8b..e2dca16 100644
--- a/asterix-app/src/test/resources/demo0927/local/join-cust-ord.aql
+++ b/asterix-app/src/test/resources/demo0927/local/join-cust-ord.aql
@@ -45,14 +45,14 @@
   total: float
 }
 
-declare nodegroup group1 on nc1, nc2;
+declare nodegroup group1 on asterix_nc1, asterix_nc2;
 
 declare dataset Customers(CustomerType) 
   primary key cid on group1;
 declare dataset Orders(OrderType)
   primary key oid on group1;
 
-write output to nc1:"/tmp/custorder.adm";
+write output to asterix_nc1:"/tmp/custorder.adm";
 
 for $c in dataset('Customers')
 for $o in dataset('Orders')
diff --git a/asterix-app/src/test/resources/demo0927/local/load-cust.aql b/asterix-app/src/test/resources/demo0927/local/load-cust.aql
index cb8d591..71ce704 100644
--- a/asterix-app/src/test/resources/demo0927/local/load-cust.aql
+++ b/asterix-app/src/test/resources/demo0927/local/load-cust.aql
@@ -35,12 +35,12 @@
   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:///tmp/customerData.adm"),("format"="json")) pre-sorted;
+(("path"="asterix_nc1:///tmp/customerData.adm"),("format"="json")) pre-sorted;
 
diff --git a/asterix-app/src/test/resources/demo0927/local/load-ord.aql b/asterix-app/src/test/resources/demo0927/local/load-ord.aql
index 5196588..8377df6 100644
--- a/asterix-app/src/test/resources/demo0927/local/load-ord.aql
+++ b/asterix-app/src/test/resources/demo0927/local/load-ord.aql
@@ -27,12 +27,12 @@
   total: float
 }
 
-declare nodegroup group1 on nc1, nc2;
+declare nodegroup group1 on asterix_nc1, asterix_nc2;
 
 declare dataset Orders(OrderType)
   primary key oid on group1;
 
-load dataset Orders from nc1:"/tmp/orderData.json";
+load dataset Orders from asterix_nc1:"/tmp/orderData.json";
 using "org.apache.asterix.external.dataset.adapter.NCFileSystemAdapter"
-(("path"="nc1:///tmp/orderData.json"),("format"="adm")) pre-sorted;
+(("path"="asterix_nc1:///tmp/orderData.json"),("format"="adm")) pre-sorted;