Index: trunk/Nebulous/scripts/bench_test.pl
===================================================================
--- trunk/Nebulous/scripts/bench_test.pl	(revision 3014)
+++ trunk/Nebulous/scripts/bench_test.pl	(revision 4440)
@@ -7,8 +7,8 @@
 
 use Benchmark qw( timethese );
-use PS::IPP::IData::Client;
+use Nebulous::Client;
 
-my $idata = PS::IPP::IData::Client->new(
-    proxy   => 'http://localhost:80/idata'
+my $neb = Nebulous::Client->new(
+    proxy   => 'http://localhost:80/nebulous'
 );
 
@@ -18,7 +18,7 @@
     {
         'create/delete' => sub {
-            my $fh = $idata->create( $key );
+            my $fh = $neb->create( $key );
             close $fh;
-            $idata->delete( $key );
+            $neb->delete( $key );
         },
     }
Index: trunk/Nebulous/scripts/imageserver.pl
===================================================================
--- trunk/Nebulous/scripts/imageserver.pl	(revision 3014)
+++ trunk/Nebulous/scripts/imageserver.pl	(revision 4440)
@@ -8,7 +8,7 @@
 
 use SOAP::Transport::HTTP;
-use PS::IPP::IData::Server;
+use Nebulous::Server;
    
 SOAP::Transport::HTTP::CGI
-    -> dispatch_to( 'PS::IPP::IData::Server' )
+    -> dispatch_to( 'Nebulous::Server' )
     -> handle;
Index: trunk/Nebulous/scripts/ptest.pl
===================================================================
--- trunk/Nebulous/scripts/ptest.pl	(revision 3014)
+++ trunk/Nebulous/scripts/ptest.pl	(revision 4440)
@@ -6,9 +6,8 @@
 use lib "./lib";
 
-use PS::IPP::IData::Client;
+use Nebulous::Client;
 
-my $idata = PS::IPP::IData::Client->new(
-    uri     => 'http://localhost:80/PS/IPP/IData/Server',
-    proxy   => 'http://localhost:80/idata'
+my $neb = Nebulous::Client->new(
+    proxy   => 'http://localhost:80/nebulous'
 );
 
@@ -22,5 +21,5 @@
     unless ( $pid )  {
         my $fname = "${key}_$id";
-        my $fh = $idata->create( $fname );
+        my $fh = $neb->create( $fname );
         die "can't create file $fname" unless $fh;
 
@@ -28,17 +27,17 @@
 
         close $fh;
-        $idata->unlock( $fname, 'write' );
+        $neb->unlock( $fname, 'write' );
 
-        $fh = $idata->open( $fname, 'read' ) or die "can't open file";
+        $fh = $neb->open( $fname, 'read' ) or die "can't open file";
         close $fh;
-        $idata->unlock( $fname, 'read' );
+        $neb->unlock( $fname, 'read' );
 
-        $idata->replicate( $fname );
-        $idata->cull( $fname );
-        $idata->find( $fname );
-        $idata->copy( $fname, $fname . "_copy" );
-        $idata->move( $fname, $fname . "_move" );
-        $idata->delete( $fname . "_copy" );
-        $idata->delete( $fname . "_move" );
+        $neb->replicate( $fname );
+        $neb->cull( $fname );
+        $neb->find( $fname );
+        $neb->copy( $fname, $fname . "_copy" );
+        $neb->move( $fname, $fname . "_move" );
+        $neb->delete( $fname . "_copy" );
+        $neb->delete( $fname . "_move" );
 
         exit 0;
Index: trunk/Nebulous/scripts/stest.pl
===================================================================
--- trunk/Nebulous/scripts/stest.pl	(revision 3014)
+++ trunk/Nebulous/scripts/stest.pl	(revision 4440)
@@ -6,18 +6,18 @@
 use lib "./lib";
 
-use PS::IPP::IData::Client; # trace => 'debug';
+use Nebulous::Client; # trace => 'debug';
 
-my $idata = PS::IPP::IData::Client->new(
-    proxy   => 'http://localhost:80/idata'
+my $neb = Nebulous::Client->new(
+    proxy   => 'http://localhost:80/nebulous'
 );
 
 my $fname = shift;
 
-#my $fh = $idata->create( $fname );
-#$idata->unlock( $fname, 'write' );
+#my $fh = $neb->create( $fname );
+#$neb->unlock( $fname, 'write' );
 
-$idata->create( $fname, 1 );
-$idata->unlock( $fname, 'write' );
-$idata->delete( $fname );
+$neb->create( $fname, 1 );
+$neb->unlock( $fname, 'write' );
+$neb->delete( $fname );
 
 __END__
@@ -28,5 +28,5 @@
     print $fh "fooby\n";
     close $fh;
-    #$idata->unlock( $fname, 'write' );
+    #$neb->unlock( $fname, 'write' );
     my $filesize =  (stat( $key ))[7];
     print "created file $key, ${filesize}bytes\n";