diff --git a/app/models/spree/payment_method_decorator.rb b/app/models/spree/payment_method_decorator.rb
index 37661463c9..01f6e2f0e8 100644
--- a/app/models/spree/payment_method_decorator.rb
+++ b/app/models/spree/payment_method_decorator.rb
@@ -39,9 +39,7 @@ Spree::Gateway.providers.each do |p|
         "Cash/EFT/etc. (payments for which automatic validation is not required)"
       when "Spree::Gateway::Migs"
         "MasterCard Internet Gateway Service (MIGS)"
-      when "Spree::BillingIntegration::PaypalExpressUk"
-        "PayPal Express (UK)"
-      when "Spree::BillingIntegration::PaypalExpress"
+      when "Spree::Gateway::PayPalExpress"
         "PayPal Express"
       else
         i = name.rindex('::') + 2
diff --git a/spec/models/spree/payment_method_spec.rb b/spec/models/spree/payment_method_spec.rb
index cfd78cfa70..692db7c7a4 100644
--- a/spec/models/spree/payment_method_spec.rb
+++ b/spec/models/spree/payment_method_spec.rb
@@ -19,7 +19,7 @@ module Spree
     it "generates a clean name for known Payment Method types" do
       Spree::PaymentMethod::Check.clean_name.should == "Cash/EFT/etc. (payments for which automatic validation is not required)"
       Spree::Gateway::Migs.clean_name.should == "MasterCard Internet Gateway Service (MIGS)"
-      Spree::BillingIntegration::PaypalExpress.clean_name.should == "PayPal Express"
+      Spree::Gateway::PayPalExpress.clean_name.should == "PayPal Express"
 
       # Testing else condition
       Spree::Gateway::BogusSimple.clean_name.should == "BogusSimple"