diff --git a/Changes b/Changes
index 7690119..115f8ad 100644
--- a/Changes
+++ b/Changes
@@ -1,4 +1,4 @@
-Revision history for Net-RebuildTCP
+Revision history for TCP-Rebuild
 
 0.01    2010-02-12
         First version, probably has many bugs.
diff --git a/Makefile.PL b/Makefile.PL
index cc75275..10d31ae 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -4,19 +4,18 @@ use warnings;
 
 use inc::Module::Install;
 
-name          ('Net-RebuildTCP');
+name          ('TCP-Rebuild');
 author        ('David Cannings <david@edeca.net>');
 license       ('perl');
-all_from      ('lib/Net/RebuildTCP.pm');
+all_from      ('lib/TCP/Rebuild.pm');
 
-requires('Net::LibNIDS'	=> '0.02'); # bugfixes
+requires('Net::LibNIDS'	=> '0.04'); # bugfixes
 requires('Pod::Usage'	=> '1.00');
 
 #extra_tests;
 
 install_script('bin/tcprebuild');
 
-repository('http://github.com/edeca/HTTP-Sessioniser');
-auto_manifest;
+repository('http://github.com/edeca/TCP-Rebuild');
 
 WriteAll();
diff --git a/README b/README
index 2485694..f62292b 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
-Net-RebuildTCP
-==============
+TCP-Rebuild
+===========
 
 A Perl alternative to utilities such as tcpick or tcpflow, with the 
 benefit of extra options, bugfixes and it should work on 64-bit machines.
@@ -24,21 +24,21 @@ SUPPORT AND DOCUMENTATION
 After installing, you can find documentation for this module with the
 perldoc command.
 
-    perldoc Net::RebuildTCP
+    perldoc TCP::Rebuild
 
 You can also look for information at:
 
     RT, CPAN's request tracker
-        http://rt.cpan.org/NoAuth/Bugs.html?Dist=Net-RebuildTCP
+        http://rt.cpan.org/NoAuth/Bugs.html?Dist=TCP-Rebuild
 
     AnnoCPAN, Annotated CPAN documentation
-        http://annocpan.org/dist/Net-RebuildTCP
+        http://annocpan.org/dist/TCP-Rebuild
 
     CPAN Ratings
-        http://cpanratings.perl.org/d/Net-RebuildTCP
+        http://cpanratings.perl.org/d/TCP-Rebuild
 
     Search CPAN
-        http://search.cpan.org/dist/Net-RebuildTCP/
+        http://search.cpan.org/dist/TCP-Rebuild/
 
 
 LICENSE AND COPYRIGHT
diff --git a/lib/Net/RebuildTCP.pm b/lib/TCP/Rebuild.pm
similarity index 87%
rename from lib/Net/RebuildTCP.pm
rename to lib/TCP/Rebuild.pm
index d2610e3..d5f58c1 100644
--- a/lib/Net/RebuildTCP.pm
+++ b/lib/TCP/Rebuild.pm
@@ -1,8 +1,8 @@
-package Net::RebuildTCP;
+package TCP::Rebuild;
 
 use warnings;
 use strict;
-use Net::LibNIDS 0.02;
+use Net::LibNIDS 0.04;
 use Socket qw(inet_ntoa);
 use IO::File;
 use Getopt::Long;
@@ -10,7 +10,7 @@ use Date::Format;
 
 =head1 NAME
 
-Net::RebuildTCP - Rebuild TCP streams to files on disk.
+TCP::Rebuild - Rebuild TCP streams to files on disk.
 
 =head1 VERSION
 
@@ -25,21 +25,16 @@ our $VERSION = '0.01';
 
 Rebuilds TCP streams to plain text files on disk, one file per connection.
 
-  use Net::RebuildTCP;
+  use TCP::Rebuild;
 
-  my $tcp = Net::RebuildTCP->new();
-  $tcp->rebuild('/path/to/file.pcap');
-
-=head1 EXPORT
-
-A list of functions that can be exported.  You can delete this section
-if you don't export anything, such as for a purely object-oriented module.
+  my $r = TCP::Rebuild->new();
+  $r->rebuild('/path/to/file.pcap');
 
 =head1 SUBROUTINES/METHODS
 
 =head2 rebuild
 
-  $tcprebuild->rebuild('/path/to/file.pcap');
+  $r->rebuild('/path/to/file.pcap');
 
 This method rebuilds a specific pcap file using the currently set options.
 
@@ -81,9 +76,9 @@ sub rebuild {
 
 =head2 new
 
-  my $tcp = Net::RebuildTCP->new;
+  my $r = TCP::Rebuild->new;
 
-This method constructs a new Net::RebuildTCP object.  
+This method constructs a new TCP::Rebuild object.  
 
 =cut
 
@@ -224,8 +219,8 @@ David Cannings, C<< <david at edeca.net> >>
 
 =head1 BUGS
 
-Please report any bugs or feature requests to C<bug-net-rebuildtcp at rt.cpan.org>, or through
-the web interface at L<http://rt.cpan.org/NoAuth/ReportBug.html?Queue=Net-RebuildTCP>.  I will be notified, and then you'll
+Please report any bugs or feature requests to C<bug-tcp-rebuild at rt.cpan.org>, or through
+the web interface at L<http://rt.cpan.org/NoAuth/ReportBug.html?Queue=TCP-Rebuild>.  I will be notified, and then you'll
 automatically be notified of progress on your bug as I make changes.
 
 =head1 TODO
@@ -251,7 +246,7 @@ Things that would be nice to implement
 
 You can find documentation for this module with the perldoc command.
 
-    perldoc Net::RebuildTCP
+    perldoc TCP::Rebuild
 
 
 You can also look for information at:
@@ -260,19 +255,19 @@ You can also look for information at:
 
 =item * RT: CPAN's request tracker
 
-L<http://rt.cpan.org/NoAuth/Bugs.html?Dist=Net-RebuildTCP>
+L<http://rt.cpan.org/NoAuth/Bugs.html?Dist=TCP-Rebuild>
 
 =item * AnnoCPAN: Annotated CPAN documentation
 
-L<http://annocpan.org/dist/Net-RebuildTCP>
+L<http://annocpan.org/dist/TCP-Rebuild>
 
 =item * CPAN Ratings
 
-L<http://cpanratings.perl.org/d/Net-RebuildTCP>
+L<http://cpanratings.perl.org/d/TCP-Rebuild>
 
 =item * Search CPAN
 
-L<http://search.cpan.org/dist/Net-RebuildTCP/>
+L<http://search.cpan.org/dist/TCP-Rebuild/>
 
 =back
 
@@ -295,4 +290,4 @@ See http://dev.perl.org/licenses/ for more information.
 
 =cut
 
-1; # End of Net::RebuildTCP
+1; # End of TCP::Rebuild
diff --git a/lib/Net/RebuildTCP/App.pm b/lib/TCP/Rebuild/App.pm
similarity index 100%
rename from lib/Net/RebuildTCP/App.pm
rename to lib/TCP/Rebuild/App.pm