diff --git a/app/controllers/PaymentController.php b/app/controllers/PaymentController.php
index d05e6a6a113a..d1f46ec02b09 100755
--- a/app/controllers/PaymentController.php
+++ b/app/controllers/PaymentController.php
@@ -132,7 +132,7 @@ class PaymentController extends \BaseController
 		$gateway = $invoice->client->account->account_gateways[0]->gateway;
         $paymentLibrary = $gateway->paymentlibrary;
 
-        if ($input && $paymentLibrary->name == "Omnipay")
+        if ($input && $paymentLibrary->id == PAYMENT_LIBRARY_OMNIPAY)
         {
             $data = [
                 'firstName' => $input['first_name'],
@@ -155,7 +155,7 @@ class PaymentController extends \BaseController
 
             Session::put($key, $data);
         }
-		else if ($input && $paymentLibrary->name == "PHP-Payments")
+		else if ($input && $paymentLibrary->id == PAYMENT_LIBRARY_PHP_PAYMENTS)
         {
         	$input = Input::all();
             $data = [
@@ -202,7 +202,7 @@ class PaymentController extends \BaseController
             $data = [];
         }
 
-		if($paymentLibrary->name == "Omnipay")
+		if($paymentLibrary->id == PAYMENT_LIBRARY_OMNIPAY)
 		{
 	        $card = new CreditCard($data);
 	        
@@ -304,7 +304,7 @@ class PaymentController extends \BaseController
 
         try
         {
-        	if($paymentLibrary->name == "Omnipay")
+        	if($paymentLibrary->id == PAYMENT_LIBRARY_OMNIPAY)
 			{
 	        	$gateway = self::createGateway($accountGateway);
 	            $details = self::getPaymentDetails($invoice, Input::all());
@@ -317,7 +317,7 @@ class PaymentController extends \BaseController
 	                return Redirect::to('payment/' . $invitationKey)
 	                    ->withInput();
 	            }
-	
+
 	            if ($response->isSuccessful())
 	            {
 	                $payment = self::createPayment($invitation, $ref);
@@ -343,7 +343,7 @@ class PaymentController extends \BaseController
 	                return Utils::fatalError('Sorry, there was an error processing your payment. Please try again later.<p>', $response->getMessage());
 	            }
             }
-			else if ($paymentLibrary->name == "PHP-Payments")
+			else if ($paymentLibrary->id == PAYMENT_LIBRARY_PHP_PAYMENTS)
 	        {
 	        	$provider = $accountGateway->gateway->provider;
 				$p = new PHP_Payments;
diff --git a/app/models/Gateway.php b/app/models/Gateway.php
index 3fdbe9169667..c1e747ffa8f7 100755
--- a/app/models/Gateway.php
+++ b/app/models/Gateway.php
@@ -19,7 +19,7 @@ class Gateway extends Eloquent
 	{
 		$paymentLibrary =  $this->paymentlibrary;
 		
-		if($paymentLibrary->name == 'Omnipay')
+		if($paymentLibrary->id == PAYMENT_LIBRARY_OMNIPAY)
 		{
 			$fields = Omnipay::create($this->provider)->getDefaultParameters();	
 		}
diff --git a/app/routes.php b/app/routes.php
index 0ed60c8c673a..ab0a00b29a1f 100755
--- a/app/routes.php
+++ b/app/routes.php
@@ -241,6 +241,8 @@ define('DEFUALT_LOCALE', 'en');
 define('GATEWAY_PAYPAL_EXPRESS', 17);
 define('NINJA_ACCOUNT_KEY', 'zg4ylmzDkdkPOT8yoKQw9LTWaoZJx79h');
 
+define('PAYMENT_LIBRARY_OMNIPAY', 1);
+define('PAYMENT_LIBRARY_PHP_PAYMENTS', 2);
 
 if (Auth::check() && !Session::has(SESSION_TIMEZONE)) 
 {