diff --git a/asterix-app/src/test/resources/dapd/denorm_user_event.aql b/asterix-app/src/test/resources/dapd/denorm_user_event.aql
index d05383f..053fc58 100644
--- a/asterix-app/src/test/resources/dapd/denorm_user_event.aql
+++ b/asterix-app/src/test/resources/dapd/denorm_user_event.aql
@@ -43,12 +43,12 @@
   end_time: datetime
 }
 
-declare nodegroup group1 on nc1, nc2;
+declare nodegroup group1 on asterix_nc1, asterix_nc2;
 
 declare dataset Users(UserType) primary key u_name on group1;
 declare dataset Events(EventType) primary key e_name on group1;
 
-write output to nc1:"/tmp/denorm_user_event.adm";
+write output to asterix_nc1:"/tmp/denorm_user_event.adm";
 
 for $u in dataset('Users')
 let $events := 
diff --git a/asterix-app/src/test/resources/dapd/q1.aql b/asterix-app/src/test/resources/dapd/q1.aql
index 614af17..e0de0eb 100644
--- a/asterix-app/src/test/resources/dapd/q1.aql
+++ b/asterix-app/src/test/resources/dapd/q1.aql
@@ -39,11 +39,11 @@
   latlong: point
 }
 
-declare nodegroup group1 on nc1, nc2;
+declare nodegroup group1 on asterix_nc1, asterix_nc2;
 
 declare dataset User(UserType) primary key name on group1;
 
-write output to nc1:"/tmp/q1.adm";
+write output to asterix_nc1:"/tmp/q1.adm";
 
 for $user in dataset('User')
 where some $i in $user.interests
diff --git a/asterix-app/src/test/resources/dapd/q2.aql b/asterix-app/src/test/resources/dapd/q2.aql
index 0d2795c..464bf8b 100644
--- a/asterix-app/src/test/resources/dapd/q2.aql
+++ b/asterix-app/src/test/resources/dapd/q2.aql
@@ -46,11 +46,11 @@
   latlong: point
 }
 
-declare nodegroup group1 on nc1;
+declare nodegroup group1 on asterix_nc1;
 
 /*
 declare dataset Event(EventType) 
-  splits nc1:"/home/nicnic/Work/Asterix/adg/event.adm";
+  splits asterix_nc1:"/home/nicnic/Work/Asterix/adg/event.adm";
 */
 
 drop dataset Event;
@@ -59,9 +59,9 @@
 
 load dataset Event 
 using "org.apache.asterix.external.dataset.adapter.NCFileSystemAdapter"
-(("path"="nc1:///home/nicnic/Work/Asterix/adg/event.adm"),("format"="adm"));
+(("path"="asterix_nc1:///home/nicnic/Work/Asterix/adg/event.adm"),("format"="adm"));
 
-write output to nc1:"/tmp/dapd_q2.adm";
+write output to asterix_nc1:"/tmp/dapd_q2.adm";
 
 for $event in dataset('Event')
 for $sponsor in $event.sponsoring_sigs