diff --git a/asterix-app/src/test/resources/demo_aql/local/01-load-cust.aql b/asterix-app/src/test/resources/demo_aql/local/01-load-cust.aql
index 5a3faf4..fab7181 100644
--- a/asterix-app/src/test/resources/demo_aql/local/01-load-cust.aql
+++ b/asterix-app/src/test/resources/demo_aql/local/01-load-cust.aql
@@ -33,12 +33,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/customer.adm"),("format"="adm")) pre-sorted;
+(("path"="asterix_nc1:///tmp/customer.adm"),("format"="adm")) pre-sorted;
 
diff --git a/asterix-app/src/test/resources/demo_aql/local/02-filter-cust.aql b/asterix-app/src/test/resources/demo_aql/local/02-filter-cust.aql
index 4918fd9..a4d27b1 100644
--- a/asterix-app/src/test/resources/demo_aql/local/02-filter-cust.aql
+++ b/asterix-app/src/test/resources/demo_aql/local/02-filter-cust.aql
@@ -33,12 +33,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/02-filter-cust.adm";
+write output to asterix_nc1:"/tmp/02-filter-cust.adm";
 
 for $c in dataset('Customers')
 where $c.age < 21 
diff --git a/asterix-app/src/test/resources/demo_aql/local/03-count-cust-age.aql b/asterix-app/src/test/resources/demo_aql/local/03-count-cust-age.aql
index 718490f..9ba6702 100644
--- a/asterix-app/src/test/resources/demo_aql/local/03-count-cust-age.aql
+++ b/asterix-app/src/test/resources/demo_aql/local/03-count-cust-age.aql
@@ -33,12 +33,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/03-count-cust-age.adm";
+write output to asterix_nc1:"/tmp/03-count-cust-age.adm";
 
 count(
 for $c in dataset('Customers')
diff --git a/asterix-app/src/test/resources/demo_aql/local/04-load-ord.aql b/asterix-app/src/test/resources/demo_aql/local/04-load-ord.aql
index a41d771..d20db92 100644
--- a/asterix-app/src/test/resources/demo_aql/local/04-load-ord.aql
+++ b/asterix-app/src/test/resources/demo_aql/local/04-load-ord.aql
@@ -27,11 +27,11 @@
   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 
 using "org.apache.asterix.external.dataset.adapter.NCFileSystemAdapter"
-(("path"="nc1:///tmp/orders.adm"),("format"="adm"));
+(("path"="asterix_nc1:///tmp/orders.adm"),("format"="adm"));
diff --git a/asterix-app/src/test/resources/demo_aql/local/05-count-param1.aql b/asterix-app/src/test/resources/demo_aql/local/05-count-param1.aql
index 5720553..a2e5eb1 100644
--- a/asterix-app/src/test/resources/demo_aql/local/05-count-param1.aql
+++ b/asterix-app/src/test/resources/demo_aql/local/05-count-param1.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;
 
-write output to nc1:"/tmp/05-count-param1.adm";
+write output to asterix_nc1:"/tmp/05-count-param1.adm";
 
 count(
 for $o in dataset('Orders')
diff --git a/asterix-app/src/test/resources/demo_aql/local/06-count-custord.aql b/asterix-app/src/test/resources/demo_aql/local/06-count-custord.aql
index 595f5c9..e72a79d 100644
--- a/asterix-app/src/test/resources/demo_aql/local/06-count-custord.aql
+++ b/asterix-app/src/test/resources/demo_aql/local/06-count-custord.aql
@@ -43,14 +43,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/06-count-custord.adm";
+write output to asterix_nc1:"/tmp/06-count-custord.adm";
 
 for $c in dataset('Customers')
 for $o in dataset('Orders')
diff --git a/asterix-app/src/test/resources/demo_aql/local/101-load-dblp.aql b/asterix-app/src/test/resources/demo_aql/local/101-load-dblp.aql
index 6c52ed6..c810f14 100644
--- a/asterix-app/src/test/resources/demo_aql/local/101-load-dblp.aql
+++ b/asterix-app/src/test/resources/demo_aql/local/101-load-dblp.aql
@@ -26,11 +26,11 @@
  misc: string
 }
 
-declare nodegroup group1 on nc1, nc2;
+declare nodegroup group1 on asterix_nc1, asterix_nc2;
 
 declare dataset DBLP(DBLPType)
  primary key id on group1;
 
 load dataset DBLP 
 using "org.apache.asterix.external.dataset.adapter.NCFileSystemAdapter"
-(("path"="nc1:///tmp/dblp-id.txt"),("format"="delimited-text"),("delimiter"=":"));
+(("path"="asterix_nc1:///tmp/dblp-id.txt"),("format"="delimited-text"),("delimiter"=":"));
diff --git a/asterix-app/src/test/resources/demo_aql/local/102-fuzzy-select.aql b/asterix-app/src/test/resources/demo_aql/local/102-fuzzy-select.aql
index 2411f6d..1d7a2ca 100644
--- a/asterix-app/src/test/resources/demo_aql/local/102-fuzzy-select.aql
+++ b/asterix-app/src/test/resources/demo_aql/local/102-fuzzy-select.aql
@@ -26,12 +26,12 @@
  misc: string
 }
 
-declare nodegroup group1 on nc1, nc2;
+declare nodegroup group1 on asterix_nc1, asterix_nc2;
 
 declare dataset DBLP(DBLPType)
  primary key id on group1;
 
-write output to nc1:"/tmp/102-fuzzy-select.adm";
+write output to asterix_nc1:"/tmp/102-fuzzy-select.adm";
 
 for $x in dataset('DBLP')
 let $ed := edit-distance($x.authors, "Michael Carey")
diff --git a/asterix-app/src/test/resources/demo_aql/local/110-self-join-dblp.aql b/asterix-app/src/test/resources/demo_aql/local/110-self-join-dblp.aql
index 28aa6f0..df6f75a 100644
--- a/asterix-app/src/test/resources/demo_aql/local/110-self-join-dblp.aql
+++ b/asterix-app/src/test/resources/demo_aql/local/110-self-join-dblp.aql
@@ -26,12 +26,12 @@
  misc: string
 }
 
-declare nodegroup group1 on nc1, nc2;
+declare nodegroup group1 on asterix_nc1, asterix_nc2;
 
 declare dataset DBLP(DBLPType) 
   primary key id on group1;
 
-write output to nc1:"/tmp/110-self-join-dblp.adm";
+write output to asterix_nc1:"/tmp/110-self-join-dblp.adm";
 
 set simthreshold '.5f';