Index: trunk/Nebulous/lib/Nebulous/Client.pm
===================================================================
--- trunk/Nebulous/lib/Nebulous/Client.pm	(revision 3016)
+++ trunk/Nebulous/lib/Nebulous/Client.pm	(revision 4440)
@@ -1,7 +1,7 @@
 # Copyright (c) 2004  Joshua Hoblitt
 #
-# $Id: Client.pm,v 1.14 2005-01-06 04:11:02 jhoblitt Exp $
-
-package PS::IPP::IData::Client;
+# $Id: Client.pm,v 1.15 2005-06-30 02:35:06 jhoblitt Exp $
+
+package Nebulous::Client;
 
 use strict;
@@ -12,6 +12,6 @@
 use File::Copy qw();
 use Log::Log4perl qw(get_logger :levels);
-use PS::IPP::IData::Client::Log;
-use PS::IPP::IData::Util qw( :standard );
+use Nebulous::Client::Log;
+use Nebulous::Util qw( :standard );
 use Params::Validate qw( validate validate_pos SCALAR );
 #use SOAP::Lite +trace => [qw( debug )];
@@ -23,5 +23,5 @@
 use constant LOCK_DEFAULT   => 10;    # default to a 10s lock timeout
 
-my $log = get_logger( "PS::IPP::IData::Client" );
+my $log = get_logger( "Nebulous::Client" );
 $log->level( $WARN );
 
@@ -74,5 +74,5 @@
     my $lite = SOAP::Lite->new(
             proxy => $args{ 'proxy' },
-            uri   => $args{ 'uri' } || "urn:PS/IPP/IData/Server/SOAP",
+            uri   => $args{ 'uri' } || "urn:Nebulous/Server/SOAP",
     );
 
Index: trunk/Nebulous/lib/Nebulous/Client.pod
===================================================================
--- trunk/Nebulous/lib/Nebulous/Client.pod	(revision 3016)
+++ trunk/Nebulous/lib/Nebulous/Client.pod	(revision 4440)
@@ -3,32 +3,33 @@
 =head1 NAME
 
-PS::IPP::IData::Client - iData client component
+Nebulous::Client - Nebulous client component
 
 =head1 SYNOPSIS
 
-    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'
     );
 
-    my $fh = $idata->create( "key", 0, "node01", "example" );
-    $idata->replicate( "key", "node01" );
-    $idata->cull( "key" );
-    $idata->lock( "key", 'write' );
-    $idata->unlock( "key", 'write' );
-    my $uris = $idata->find_instances( "key", "node01" );
-    my $path = $idata->find( "key" );
-    my $fh = $idata->open( "key", 'read' );
+    my $fh = $neb->create( "key", 0, "node01", "example" );
+    $neb->replicate( "key", "node01" );
+    $neb->cull( "key" );
+    $neb->lock( "key", 'write' );
+    $neb->unlock( "key", 'write' );
+    my $uris = $neb->find_instances( "key", "node01" );
+    my $path = $neb->find( "key" );
+    my $fh = $neb->open( "key", 'read' );
     $data->delete( "key" );
     $data->copy( "key", "new_key" );
     $data->move( "key", "new_key" );
     $data->delete_instance( $uri );
-    my $stats = $idata->stat( "key" );
+    my $stats = $neb->stat( "key" );
 
 =head1 DESCRIPTION
 
-This component provides client access to the iData storage system.  It provides
-an interface for files to be added, managed, and removed from the system.
+This component provides client access to the Nebulous storage system.  It
+provides an interface for files to be added, managed, and removed from the
+system.
 
 =head1 USAGE
@@ -39,5 +40,5 @@
 I<symbols>.
 
-    use PS::IPP::IData::Client trace => qw( debug );
+    use Nebulous::Client trace => qw( debug );
 
 The hash is allowed to have a single key, C<trace>.  This controls the level of
@@ -57,7 +58,7 @@
 Accepts a mandatory hash.
 
-    my $idata = PS::IPP::IData::Client->new(
-        proxy   => 'http://localhost:80/idata'
-        uri     => 'urn:PS/IPP/IData/Server',
+    my $neb = Nebulous::Client->new(
+        proxy   => 'http://localhost:80/nebulous'
+        uri     => 'urn:Nebulous/Server',
     );
 
@@ -66,5 +67,5 @@
 =item * proxy
 
-The URL of the iData server to connect to.
+The URL of the Nebulous server to connect to.
 
 =item * uri
@@ -119,5 +120,5 @@
 =item MogileFS
 
-The iData system is similar in function to MogileFS but very different in
+The Nebulous system is similar in function to MogileFS but very different in
 implementation and operation.
 
@@ -160,5 +161,5 @@
 =head1 SEE ALSO
 
-L<PS::IPP::IData::Server>
+L<Nebulous::Server>
 
 =cut
Index: trunk/Nebulous/lib/Nebulous/Client/HTTP.pm
===================================================================
--- trunk/Nebulous/lib/Nebulous/Client/HTTP.pm	(revision 3016)
+++ trunk/Nebulous/lib/Nebulous/Client/HTTP.pm	(revision 4440)
@@ -1,7 +1,7 @@
 # Copyright (c) 2004  Joshua Hoblitt
 #
-# $Id: HTTP.pm,v 1.1.1.1 2004-12-22 02:16:24 jhoblitt Exp $
+# $Id: HTTP.pm,v 1.2 2005-06-30 02:35:06 jhoblitt Exp $
 
-package PS::IPP::IData::Client::HTTP;
+package Nebulous::Client::HTTP;
 
 use strict;
Index: trunk/Nebulous/lib/Nebulous/Client/Log.pm
===================================================================
--- trunk/Nebulous/lib/Nebulous/Client/Log.pm	(revision 3016)
+++ trunk/Nebulous/lib/Nebulous/Client/Log.pm	(revision 4440)
@@ -1,7 +1,7 @@
 # Copyright (c) 2004  Joshua Hoblitt
 #
-# $Id: Log.pm,v 1.2 2005-01-05 02:44:54 jhoblitt Exp $
+# $Id: Log.pm,v 1.3 2005-06-30 02:35:06 jhoblitt Exp $
 
-package PS::IPP::IData::Client::Log;
+package Nebulous::Client::Log;
 
 use strict;
@@ -13,6 +13,6 @@
 
 my $conf = q(
-    log4perl.category.PS.IPP.IData.Client = DEBUG, Screen
-#log4perl.category.PS.IPP.IData.Client = DEBUG, CLIENTLOGFILE, Screen
+    log4perl.category.Nebulous.Client = DEBUG, Screen
+#log4perl.category.Nebulous.Client = DEBUG, CLIENTLOGFILE, Screen
 
     log4perl.appender.Screen        = Log::Log4perl::Appender::Screen
@@ -22,5 +22,5 @@
 
     log4perl.appender.CLIENTLOGFILE           = Log::Log4perl::Appender::File
-    log4perl.appender.CLIENTLOGFILE.filename  = /tmp/idata_client.log
+    log4perl.appender.CLIENTLOGFILE.filename  = /tmp/nebulous_client.log
     log4perl.appender.CLIENTLOGFILE.mode      = append
     log4perl.appender.CLIENTLOGFILE.layout    = Log::Log4perl::Layout::PatternLayout
Index: trunk/Nebulous/lib/Nebulous/Server.pm
===================================================================
--- trunk/Nebulous/lib/Nebulous/Server.pm	(revision 3016)
+++ trunk/Nebulous/lib/Nebulous/Server.pm	(revision 4440)
@@ -1,7 +1,7 @@
 # Copyright (c) 2004  Joshua Hoblitt
 #
-# $Id: Server.pm,v 1.8 2005-01-05 04:31:59 jhoblitt Exp $
-
-package PS::IPP::IData::Server;
+# $Id: Server.pm,v 1.9 2005-06-30 02:35:06 jhoblitt Exp $
+
+package Nebulous::Server;
 
 use strict;
@@ -11,7 +11,7 @@
 
 use DBI;
-use PS::IPP::IData::Util qw( :standard );
-use PS::IPP::IData::Server::Log;
-use PS::IPP::IData::Server::SQL;
+use Nebulous::Util qw( :standard );
+use Nebulous::Server::Log;
+use Nebulous::Server::SQL;
 use Log::Log4perl;
 use Params::Validate qw( validate_pos SCALAR );
@@ -40,6 +40,6 @@
     );
 
-    $log = Log::Log4perl::get_logger( "PS::IPP::IData::Server" );
-    $sql = PS::IPP::IData::Server::SQL->new;
+    $log = Log::Log4perl::get_logger( "Nebulous::Server" );
+    $sql = Nebulous::Server::SQL->new;
 
     $log->debug( "entered - @_" );
Index: trunk/Nebulous/lib/Nebulous/Server.pod
===================================================================
--- trunk/Nebulous/lib/Nebulous/Server.pod	(revision 3016)
+++ trunk/Nebulous/lib/Nebulous/Server.pod	(revision 4440)
@@ -3,22 +3,22 @@
 =head1 NAME
 
-PS::IPP::IData::Server - iData server component
+Nebulous::Server - Nebulous server component
 
 =head1 SYNOPSIS
 
-    use PS::IPP::IData::Server;
+    use Nebulous::Server;
 
-    PS::IPP::IData::Server->setup( $dsn, $username, $passwd );
-    PS::IPP::IData::Server->create_object( $key, $class, $volume, $comment );
-    PS::IPP::IData::Server->replicate_object( $key, $volume );
-    PS::IPP::IData::Server->lock_object( $key, $type );
-    PS::IPP::IData::Server->unlock_object( $key, $type );
-    PS::IPP::IData::Server->find_instance( $key, $volume );
-    PS::IPP::IData::Server->delete_instance( $uri );
-    PS::IPP::IData::Server->stat_object( $key );
+    Nebulous::Server->setup( $dsn, $username, $passwd );
+    Nebulous::Server->create_object( $key, $class, $volume, $comment );
+    Nebulous::Server->replicate_object( $key, $volume );
+    Nebulous::Server->lock_object( $key, $type );
+    Nebulous::Server->unlock_object( $key, $type );
+    Nebulous::Server->find_instance( $key, $volume );
+    Nebulous::Server->delete_instance( $uri );
+    Nebulous::Server->stat_object( $key );
 
 =head1 DESCRIPTION
 
-This is the server side component of the iData system.  It is primarily a
+This is the server side component of the Nebulous system.  It is primarily a
 middle-ware abstraction of an SQL database.
 
@@ -120,5 +120,5 @@
 =head1 SEE ALSO
 
-L<PS::IPP::IData::Client>
+L<Nebulous::Client>
 
 =cut
Index: trunk/Nebulous/lib/Nebulous/Server/Apache.pm
===================================================================
--- trunk/Nebulous/lib/Nebulous/Server/Apache.pm	(revision 3016)
+++ trunk/Nebulous/lib/Nebulous/Server/Apache.pm	(revision 4440)
@@ -3,5 +3,5 @@
 # $Id
 
-package PS::IPP::IData::Server::Apache;
+package Nebulous::Server::Apache;
 
 use strict;
@@ -10,9 +10,9 @@
 our $VERSION = 0.01;
 
-use PS::IPP::IData::Server::SOAP;
+use Nebulous::Server::SOAP;
 use SOAP::Transport::HTTP;
 
 my $server = SOAP::Transport::HTTP::Apache
-    ->dispatch_to( 'PS::IPP::IData::Server::SOAP' )
+    ->dispatch_to( 'Nebulous::Server::SOAP' )
     ->options({ compress_threshold => 10 * 1024 });
 
Index: trunk/Nebulous/lib/Nebulous/Server/Log.pm
===================================================================
--- trunk/Nebulous/lib/Nebulous/Server/Log.pm	(revision 3016)
+++ trunk/Nebulous/lib/Nebulous/Server/Log.pm	(revision 4440)
@@ -1,7 +1,7 @@
 # Copyright (c) 2004  Joshua Hoblitt
 #
-# $Id: Log.pm,v 1.2 2005-01-05 02:44:54 jhoblitt Exp $
+# $Id: Log.pm,v 1.3 2005-06-30 02:35:06 jhoblitt Exp $
 
-package PS::IPP::IData::Server::Log;
+package Nebulous::Server::Log;
 
 use strict;
@@ -13,8 +13,8 @@
                                                                                                                                           
 my $conf = q(
-    log4perl.category.PS.IPP.IData.Server = DEBUG, SERVERLOGFILE
+    log4perl.category.Nebulous.Server = DEBUG, SERVERLOGFILE
 
     log4perl.appender.SERVERLOGFILE           = Log::Log4perl::Appender::File
-    log4perl.appender.SERVERLOGFILE.filename  = /tmp/idata_server.log
+    log4perl.appender.SERVERLOGFILE.filename  = /tmp/nebulous_server.log
     log4perl.appender.SERVERLOGFILE.mode      = append
     log4perl.appender.SERVERLOGFILE.layout    = Log::Log4perl::Layout::PatternLayout
Index: trunk/Nebulous/lib/Nebulous/Server/SOAP.pm
===================================================================
--- trunk/Nebulous/lib/Nebulous/Server/SOAP.pm	(revision 3016)
+++ trunk/Nebulous/lib/Nebulous/Server/SOAP.pm	(revision 4440)
@@ -1,7 +1,7 @@
 # Copyright (c) 2004  Joshua Hoblitt
 #
-# $Id: SOAP.pm,v 1.1 2005-01-06 03:56:43 jhoblitt Exp $
+# $Id: SOAP.pm,v 1.2 2005-06-30 02:35:06 jhoblitt Exp $
 
-package PS::IPP::IData::Server::SOAP;
+package Nebulous::Server::SOAP;
 
 use strict;
@@ -10,5 +10,5 @@
 our $VERSION = '0.01';
 
-use PS::IPP::IData::Server;
+use Nebulous::Server;
 use SOAP::Lite;
 import SOAP::Data 'name'; 
@@ -22,5 +22,5 @@
     return undef if $method eq 'DESTROY';
 
-    return name( result => PS::IPP::IData::Server->$method( @_ ) );
+    return name( result => Nebulous::Server->$method( @_ ) );
 }
 
Index: trunk/Nebulous/lib/Nebulous/Server/SQL.pm
===================================================================
--- trunk/Nebulous/lib/Nebulous/Server/SQL.pm	(revision 3016)
+++ trunk/Nebulous/lib/Nebulous/Server/SQL.pm	(revision 4440)
@@ -1,7 +1,7 @@
 # Copyright (c) 2004  Joshua Hoblitt
 #
-# $Id: SQL.pm,v 1.4 2005-01-15 04:02:12 jhoblitt Exp $
+# $Id: SQL.pm,v 1.5 2005-06-30 02:35:06 jhoblitt Exp $
 
-package PS::IPP::IData::Server::SQL;
+package Nebulous::Server::SQL;
 
 use strict;
Index: trunk/Nebulous/lib/Nebulous/Util.pm
===================================================================
--- trunk/Nebulous/lib/Nebulous/Util.pm	(revision 3016)
+++ trunk/Nebulous/lib/Nebulous/Util.pm	(revision 4440)
@@ -1,7 +1,7 @@
 # Copyright (c) 2004  Joshua Hoblitt
 #
-# $Id: Util.pm,v 1.2 2005-01-05 02:44:54 jhoblitt Exp $
+# $Id: Util.pm,v 1.3 2005-06-30 02:35:06 jhoblitt Exp $
 
-package PS::IPP::IData::Util;
+package Nebulous::Util;
 
 use strict;