diff --git a/designdocs/commerce.pod b/designdocs/commerce.pod
index 913a5f69e..e8bb4c4ff 100644
--- a/designdocs/commerce.pod
+++ b/designdocs/commerce.pod
@@ -746,7 +746,7 @@ one-off basis.
 =head2 Method Dictionary
 
 The following methods will be available from the
-WebGUI::Shop::Ship::Driver class.
+WebGUI::Shop::ShipDriver class.
 
 Method
 
@@ -829,7 +829,7 @@ one-off basis.
 =head2 Method Dictionary
 
 The following methods will be available from the
-WebGUI::Shop::Ship::Driver::Flat class.
+WebGUI::Shop::ShipDriver::Flat class.
 
 Method
 
diff --git a/lib/WebGUI/Shop/ShipperDriver.pm b/lib/WebGUI/Shop/ShipDriver.pm
similarity index 86%
rename from lib/WebGUI/Shop/ShipperDriver.pm
rename to lib/WebGUI/Shop/ShipDriver.pm
index 30beeccaa..00e0e2e3c 100644
--- a/lib/WebGUI/Shop/ShipperDriver.pm
+++ b/lib/WebGUI/Shop/ShipDriver.pm
@@ -1,4 +1,4 @@
-package WebGUI::Shop::ShipperDriver;
+package WebGUI::Shop::ShipDriver;
 
 use strict;
 
@@ -7,7 +7,7 @@ use Carp qw(croak);
 
 =head1 NAME
 
-Package WebGUI::Shop::ShipperDriver
+Package WebGUI::Shop::ShipDriver
 
 =head1 DESCRIPTION
 
@@ -17,9 +17,9 @@ handling the information in the tax tables.
 
 =head1 SYNOPSIS
 
- use WebGUI::Shop::ShipperDriver;
+ use WebGUI::Shop::ShipDriver;
 
- my $tax = WebGUI::Shop::ShipperDriver->new($session);
+ my $tax = WebGUI::Shop::ShipDriver->new($session);
 
 =head1 METHODS
 
diff --git a/t/Shop/ShipperDriver.t b/t/Shop/ShipDriver.t
similarity index 90%
rename from t/Shop/ShipperDriver.t
rename to t/Shop/ShipDriver.t
index f99d01433..5ce9329f4 100644
--- a/t/Shop/ShipperDriver.t
+++ b/t/Shop/ShipDriver.t
@@ -34,13 +34,13 @@ plan tests => 1 + $tests;
 #----------------------------------------------------------------------------
 # put your tests here
 
-my $loaded = use_ok('WebGUI::Shop::ShipperDriver');
+my $loaded = use_ok('WebGUI::Shop::ShipDriver');
 
 my $storage;
 
 SKIP: {
 
-skip 'Unable to load module WebGUI::Shop::ShipperDriver', $tests unless $loaded;
+skip 'Unable to load module WebGUI::Shop::ShipDriver', $tests unless $loaded;
 
 #######################################################################
 #
@@ -48,9 +48,9 @@ skip 'Unable to load module WebGUI::Shop::ShipperDriver', $tests unless $loaded;
 #
 #######################################################################
 
-my $driver = WebGUI::Shop::ShipperDriver->new($session);
+my $driver = WebGUI::Shop::ShipDriver->new($session);
 
-isa_ok($driver, 'WebGUI::Shop::ShipperDriver');
+isa_ok($driver, 'WebGUI::Shop::ShipDriver');
 
 isa_ok($driver->session, 'WebGUI::Session', 'session method returns a session object');