diff --git a/docs/upgrades/upgrade_7.5.10-7.5.11.pl b/docs/upgrades/upgrade_7.5.10-7.5.11.pl
index 02ed48639..474af972e 100644
--- a/docs/upgrades/upgrade_7.5.10-7.5.11.pl
+++ b/docs/upgrades/upgrade_7.5.10-7.5.11.pl
@@ -1229,7 +1229,6 @@ sub removeOldCommerceCode {
     	print "\tRemoving old commerce code.\n" unless ($quiet);
 
     my $setting = $session->setting;
-    $setting->remove('groupIdAdminCommerce'); 
     $setting->remove('groupIdAdminProductManager'); 
     $setting->remove('groupIdAdminSubscription'); 
     $setting->remove('groupIdAdminTransactionLog'); 
@@ -1740,13 +1739,13 @@ sub migratePaymentPlugins {
         $properties->{ receiptEmailTemplateId   } = 'BMzuE91-XB8E-XGll1zpvA';
 
         # Create paydriver instance
-        my $plugin = eval { 
+        my $plugin =  
          WebGUI::Pluggable::instanciate("WebGUI::Shop::PayDriver::$namespace", 'create', [ 
                 $session, 
-                $properties->{ label },
+                $properties->{ label } || $namespace || 'Credit Card',
                 $properties
             ])
-        };
+        ;
 
         # Print warning message for ITransact users that they must change their postback url
         if ( $namespace eq 'ITransact' && $properties->{ vendorId } ) {
diff --git a/lib/WebGUI/Shop/PayDriver/Cash.pm b/lib/WebGUI/Shop/PayDriver/Cash.pm
index 07b0e152c..5b925ed63 100644
--- a/lib/WebGUI/Shop/PayDriver/Cash.pm
+++ b/lib/WebGUI/Shop/PayDriver/Cash.pm
@@ -30,7 +30,7 @@ sub definition {
     tie my %fields, 'Tie::IxHash';
 
     push @{ $definition }, {
-        name        => $i18n->echo('Cash'),
+        name        => $i18n->get('label'),
         properties  => \%fields,
     };
 
diff --git a/lib/WebGUI/Shop/PayDriver/ITransact.pm b/lib/WebGUI/Shop/PayDriver/ITransact.pm
index 45e4ad0d9..3f8e7326c 100644
--- a/lib/WebGUI/Shop/PayDriver/ITransact.pm
+++ b/lib/WebGUI/Shop/PayDriver/ITransact.pm
@@ -444,7 +444,7 @@ sub getButton {
 sub getEditForm {
     my $self    = shift;
     my $session = $self->session;
-    my $i18n    = WebGUI::International->new($session, 'CommercePaymentITransact');
+    my $i18n    = WebGUI::International->new($session, 'PayDriver_ITransact');
 
     my $f       = $self->SUPER::getEditForm( @_ );
     $f->readOnly(
@@ -484,7 +484,7 @@ sub processCredentials {
     my $self    = shift;
     my $session = $self->session;
     my $form    = $session->form;
-	my $i18n    = WebGUI::International->new($session,'CommercePaymentITransact');
+	my $i18n    = WebGUI::International->new($session,'PayDriver_ITransact');
     my @error;
 
     # Check address data
@@ -593,7 +593,7 @@ sub www_getCredentials {
     my $errors      = shift;
     my $session     = $self->session;
     my $form        = $session->form;
-    my $i18n        = WebGUI::International->new($self->session, 'CommercePaymentITransact');
+    my $i18n        = WebGUI::International->new($self->session, 'PayDriver_ITransact');
 	my $u           = WebGUI::User->new($self->session,$self->session->user->userId);
 
     # Process address from address book if passed