diff --git a/payment/payment.module b/payment/payment.module
index f872867..bce231f 100644
--- a/payment/payment.module
+++ b/payment/payment.module
@@ -212,7 +212,7 @@ function payment_menu() {
   $items['admin/config/services/payment/status'] = array(
     'title' => 'Payment statuses',
     'page callback' => 'payment_page_status',
-    'access arguments' => array('payment.status.view'),
+    'access arguments' => array('payment.payment_status.view'),
     'file' => 'payment.ui.inc',
     'weight' => 1,
   );
@@ -239,7 +239,7 @@ function payment_menu() {
     ) + $base;
     $items['user/%user/payment'] = array(
       'title' => 'Payments',
-      'access arguments' => array('payment.view.own'),
+      'access arguments' => array('payment.payment.view.own'),
     ) + $base;
   }
 
@@ -272,55 +272,55 @@ function payment_permission() {
       'title' => t('Administer rule configurations'),
       'restrict access' => TRUE,
     ),
-    'payment.administer' => array(
+    'payment.payment.administer' => array(
       'title' => t('Administer payment configuration'),
     ),
-    'payment.view.any' => array(
+    'payment.payment.view.any' => array(
       'title' => t('View any payment'),
     ),
-    'payment.view.own' => array(
+    'payment.payment.view.own' => array(
       'title' => t('View own payments'),
     ),
-    'payment.update.any' => array(
+    'payment.payment.update.any' => array(
       'title' => t('Update any payment'),
     ),
-    'payment.update.own' => array(
+    'payment.payment.update.own' => array(
       'title' => t('Update own payments'),
     ),
-    'payment.delete.any' => array(
+    'payment.payment.delete.any' => array(
       'title' => t('Delete any payment'),
     ),
-    'payment.delete.own' => array(
+    'payment.payment.delete.own' => array(
       'title' => t('Delete own payments'),
     ),
-    'payment.method.update.any' => array(
+    'payment.payment_method.update.any' => array(
       'title' => t('Update any payment method'),
       'restrict access' => TRUE,
     ),
-    'payment.method.update.own' => array(
+    'payment.payment_method.update.own' => array(
       'title' => t('Update own payment methods'),
     ),
-    'payment.method.delete.any' => array(
+    'payment.payment_method.delete.any' => array(
       'title' => t('Delete any payment method'),
     ),
-    'payment.method.delete.own' => array(
+    'payment.payment_method.delete.own' => array(
       'title' => t('Delete own payment methods'),
     ),
-    'payment.method.view.any' => array(
+    'payment.payment_method.view.any' => array(
       'title' => t('View any payment method'),
       'restrict access' => TRUE,
     ),
-    'payment.method.view.own' => array(
+    'payment.payment_method.view.own' => array(
       'title' => t('View own payment methods'),
     ),
-    'payment.status.view' => array(
+    'payment.payment_status.view' => array(
       'title' => t('View payment status overview'),
     ),
   );
   $controllers = payment_method_controller_load_multiple();
   unset($controllers['PaymentMethodControllerUnavailable']);
   foreach ($controllers as $controller) {
-    $permissions['payment.method.create.' . $controller->name] = array(
+    $permissions['payment.payment_method.create.' . $controller->name] = array(
       'title' => t('Create %controller_title payment methods', array(
         '%controller_title' => $controller->title,
       )),
@@ -416,7 +416,7 @@ function payment_entity_info() {
         'label' => t('Payment'),
         'admin' => array(
           'path' => 'admin/config/services/payment/payment',
-          'access arguments' => array('payment.administer'),
+          'access arguments' => array('payment.payment.administer'),
         ),
       ),
     ),
@@ -896,7 +896,7 @@ function payment_method_access($operation, PaymentMethod $payment_method = NULL,
 
   switch ($operation) {
     case 'create':
-      return $payment_method && user_access('payment.method.create.' . $payment_method->controller->name, $account);
+      return $payment_method && user_access('payment.payment_method.create.' . $payment_method->controller->name, $account);
     case 'enable':
       return $payment_method && $payment_method->enabled == FALSE && payment_method_access('update', $payment_method, $account);
     case 'disable':
@@ -906,7 +906,7 @@ function payment_method_access($operation, PaymentMethod $payment_method = NULL,
     case 'view':
     case 'update':
     case 'delete':
-      return user_access('payment.method.' . $operation . '.any', $account) || $payment_method && user_access('payment.method.' . $operation . '.own', $account) && $payment_method->uid == $account->uid;
+      return user_access('payment.payment_method.' . $operation . '.any', $account) || $payment_method && user_access('payment.payment_method.' . $operation . '.own', $account) && $payment_method->uid == $account->uid;
   }
   return FALSE;
 }
diff --git a/payment/payment.ui.inc b/payment/payment.ui.inc
index 4a0bc80..669e8c7 100644
--- a/payment/payment.ui.inc
+++ b/payment/payment.ui.inc
@@ -72,7 +72,7 @@ function payment_form(array $form, array &$form_state, Payment $payment, array $
     '#options' => payment_status_options(),
     '#default_value' => $payment->getStatus()->status,
     '#required' => TRUE,
-    '#description' => t('Updating a payment status manually can disrupt automatic payment processing.') . (user_access('payment.status.view') ? ' ' . l(t('Payment status overview.'), 'admin/config/services/payment/status') : ''),
+    '#description' => t('Updating a payment status manually can disrupt automatic payment processing.') . (user_access('payment.payment_status.view') ? ' ' . l(t('Payment status overview.'), 'admin/config/services/payment/status') : ''),
   );
   $form['line_items'] = payment_line_items($payment);
   $form['payment_method'] = array(
diff --git a/payment/tests/payment_test/tests/PaymentEntityPermissionWebTestCase.test b/payment/tests/payment_test/tests/PaymentEntityPermissionWebTestCase.test
index c0c675d..f27f875 100644
--- a/payment/tests/payment_test/tests/PaymentEntityPermissionWebTestCase.test
+++ b/payment/tests/payment_test/tests/PaymentEntityPermissionWebTestCase.test
@@ -25,21 +25,21 @@ class PaymentEntityPermissionWebTestCase extends PaymentWebTestCase {
     ));
 
     // Update a payment that belongs to user 1.
-    $this->XtoolsAssertEntityPermission($payment_1, 'Payment', 'payment_access', 'update', array('payment.update.any'));
+    $this->XtoolsAssertEntityPermission($payment_1, 'Payment', 'payment_access', 'update', array('payment.payment.update.any'));
 
     // Update a payment that belongs to user 2.
-    $this->XtoolsAssertEntityPermission($payment_2, 'Payment', 'payment_access', 'update', array('payment.update.own'));
+    $this->XtoolsAssertEntityPermission($payment_2, 'Payment', 'payment_access', 'update', array('payment.payment.update.own'));
 
     // Delete a payment that belongs to user 1.
-    $this->XtoolsAssertEntityPermission($payment_1, 'Payment', 'payment_access', 'delete', array('payment.delete.any'));
+    $this->XtoolsAssertEntityPermission($payment_1, 'Payment', 'payment_access', 'delete', array('payment.payment.delete.any'));
 
     // Delete a payment that belongs to user 2.
-    $this->XtoolsAssertEntityPermission($payment_2, 'Payment', 'payment_access', 'delete', array('payment.delete.own'));
+    $this->XtoolsAssertEntityPermission($payment_2, 'Payment', 'payment_access', 'delete', array('payment.payment.delete.own'));
 
     // View a payment that belongs to user 1.
-    $this->XtoolsAssertEntityPermission($payment_1, 'Payment', 'payment_access', 'view', array('payment.view.any'));
+    $this->XtoolsAssertEntityPermission($payment_1, 'Payment', 'payment_access', 'view', array('payment.payment.view.any'));
 
     // View a payment that belongs to user 2.
-    $this->XtoolsAssertEntityPermission($payment_2, 'Payment', 'payment_access', 'view', array('payment.view.own'));
+    $this->XtoolsAssertEntityPermission($payment_2, 'Payment', 'payment_access', 'view', array('payment.payment.view.own'));
   }
 }
\ No newline at end of file
diff --git a/payment/tests/payment_test/tests/PaymentMenuRouterItemPermissionWebTestCase.test b/payment/tests/payment_test/tests/PaymentMenuRouterItemPermissionWebTestCase.test
index 3931b32..48bc02d 100644
--- a/payment/tests/payment_test/tests/PaymentMenuRouterItemPermissionWebTestCase.test
+++ b/payment/tests/payment_test/tests/PaymentMenuRouterItemPermissionWebTestCase.test
@@ -18,28 +18,28 @@ class PaymentMenuRouterItemPermissionWebTestCase extends PaymentWebTestCase {
     $payment = $this->paymentCreate(2, $this->paymentMethodCreate(2, payment_method_controller_load('PaymentMethodBasicController')));
 
     // Test the payment view page.
-    $this->XtoolsAssertMenuRouterItemPermission('payment/' . $payment->pid, array('payment.view.any'));
+    $this->XtoolsAssertMenuRouterItemPermission('payment/' . $payment->pid, array('payment.payment.view.any'));
 
     // Test the payment edit page.
-    $this->XtoolsAssertMenuRouterItemPermission('payment/' . $payment->pid . '/edit', array('payment.update.any'));
+    $this->XtoolsAssertMenuRouterItemPermission('payment/' . $payment->pid . '/edit', array('payment.payment.update.any'));
 
     // Test the payment delete page.
-    $this->XtoolsAssertMenuRouterItemPermission('payment/' . $payment->pid . '/delete', array('payment.delete.any'));
+    $this->XtoolsAssertMenuRouterItemPermission('payment/' . $payment->pid . '/delete', array('payment.payment.delete.any'));
 
     // Test the administrative payment overview page (Views disabled).
-    $this->XtoolsAssertMenuRouterItemPermission('admin/content/payment', array('payment.view.any'), array(), 'Views disabled');
+    $this->XtoolsAssertMenuRouterItemPermission('admin/content/payment', array('payment.payment.view.any'), array(), 'Views disabled');
 
     // Test a user's payment overview page (Views disabled).
-    $this->XtoolsAssertMenuRouterItemPermission('user/2/payment', array('payment.view.own'), array(), 'Views disabled');
+    $this->XtoolsAssertMenuRouterItemPermission('user/2/payment', array('payment.payment.view.own'), array(), 'Views disabled');
 
     // Enable Views.
     $this->assertTrue(module_enable(array('views')), 'Enabled modules: <em>views</em>');
     $this->resetAll();
 
     // Test the administrative payment overview page (Views enabled).
-    $this->XtoolsAssertMenuRouterItemPermission('admin/content/payment', array('payment.view.any'), array(), 'Views enabled');
+    $this->XtoolsAssertMenuRouterItemPermission('admin/content/payment', array('payment.payment.view.any'), array(), 'Views enabled');
 
     // Test a user's payment overview page (Views enabled).
-    $this->XtoolsAssertMenuRouterItemPermission('user/2/payment', array('payment.view.own'), array(), 'Views enabled');
+    $this->XtoolsAssertMenuRouterItemPermission('user/2/payment', array('payment.payment.view.own'), array(), 'Views enabled');
   }
 }
\ No newline at end of file
diff --git a/payment/tests/payment_test/tests/PaymentMethodEntityPermissionWebTestCase.test b/payment/tests/payment_test/tests/PaymentMethodEntityPermissionWebTestCase.test
index eccf31b..2f2e7b0 100644
--- a/payment/tests/payment_test/tests/PaymentMethodEntityPermissionWebTestCase.test
+++ b/payment/tests/payment_test/tests/PaymentMethodEntityPermissionWebTestCase.test
@@ -16,30 +16,30 @@ class PaymentMethodEntityPermissionWebTestCase extends PaymentWebTestCase {
 
   function testPaymentMethodEntityPermissions() {
     // Create a new payment method.
-    $this->XtoolsAssertEntityPermission($this->paymentMethodCreate(0, payment_method_controller_load('PaymentMethodBasicController')), 'payment method', 'payment_method_access', 'create', array('payment.method.create.PaymentMethodBasicController'));
+    $this->XtoolsAssertEntityPermission($this->paymentMethodCreate(0, payment_method_controller_load('PaymentMethodBasicController')), 'payment method', 'payment_method_access', 'create', array('payment.payment_method.create.PaymentMethodBasicController'));
 
     // Update a payment method that belongs to user 1.
-    $this->XtoolsAssertEntityPermission($this->paymentMethodCreate(1, payment_method_controller_load('PaymentMethodBasicController')), 'payment method', 'payment_method_access', 'update', array('payment.method.update.any'));
+    $this->XtoolsAssertEntityPermission($this->paymentMethodCreate(1, payment_method_controller_load('PaymentMethodBasicController')), 'payment method', 'payment_method_access', 'update', array('payment.payment_method.update.any'));
 
     // Update a payment method that belongs to user 2.
-    $this->XtoolsAssertEntityPermission($this->paymentMethodCreate(2, payment_method_controller_load('PaymentMethodBasicController')), 'payment method', 'payment_method_access', 'update', array('payment.method.update.own'));
+    $this->XtoolsAssertEntityPermission($this->paymentMethodCreate(2, payment_method_controller_load('PaymentMethodBasicController')), 'payment method', 'payment_method_access', 'update', array('payment.payment_method.update.own'));
 
     // Delete a payment method that belongs to user 1.
-    $this->XtoolsAssertEntityPermission($this->paymentMethodCreate(1, payment_method_controller_load('PaymentMethodBasicController')), 'payment method', 'payment_method_access', 'delete', array('payment.method.delete.any'));
+    $this->XtoolsAssertEntityPermission($this->paymentMethodCreate(1, payment_method_controller_load('PaymentMethodBasicController')), 'payment method', 'payment_method_access', 'delete', array('payment.payment_method.delete.any'));
 
     // Delete a payment method that belongs to user 2.
-    $this->XtoolsAssertEntityPermission($this->paymentMethodCreate(2, payment_method_controller_load('PaymentMethodBasicController')), 'payment method', 'payment_method_access', 'delete', array('payment.method.delete.own'));
+    $this->XtoolsAssertEntityPermission($this->paymentMethodCreate(2, payment_method_controller_load('PaymentMethodBasicController')), 'payment method', 'payment_method_access', 'delete', array('payment.payment_method.delete.own'));
 
     // Enable an enabled payment method that belongs to user 1.
     $payment_method = $this->paymentMethodCreate(1, payment_method_controller_load('PaymentMethodBasicController'));
-    $this->XtoolsAssertEntityPermission($payment_method, 'enabled payment method', 'payment_method_access', 'enable', array('payment.method.update.any'), array(
+    $this->XtoolsAssertEntityPermission($payment_method, 'enabled payment method', 'payment_method_access', 'enable', array('payment.payment_method.update.any'), array(
       'root' => FALSE,
       'authenticated_with_permissions' => FALSE,
     ));
 
     // Enable an enabled payment method that belongs to user 2.
     $payment_method = $this->paymentMethodCreate(2, payment_method_controller_load('PaymentMethodBasicController'));
-    $this->XtoolsAssertEntityPermission($payment_method, 'enabled payment method', 'payment_method_access', 'enable', array('payment.method.update.own'), array(
+    $this->XtoolsAssertEntityPermission($payment_method, 'enabled payment method', 'payment_method_access', 'enable', array('payment.payment_method.update.own'), array(
       'root' => FALSE,
       'authenticated_with_permissions' => FALSE,
     ));
@@ -47,17 +47,17 @@ class PaymentMethodEntityPermissionWebTestCase extends PaymentWebTestCase {
     // Enable a disabled payment method that belongs to user 1.
     $payment_method = $this->paymentMethodCreate(1, payment_method_controller_load('PaymentMethodBasicController'));
     $payment_method->enabled = FALSE;
-    $this->XtoolsAssertEntityPermission($payment_method, 'disabled payment method', 'payment_method_access', 'enable', array('payment.method.update.any'));
+    $this->XtoolsAssertEntityPermission($payment_method, 'disabled payment method', 'payment_method_access', 'enable', array('payment.payment_method.update.any'));
 
     // Enable a disabled payment method that belongs to user 2.
     $payment_method = $this->paymentMethodCreate(2, payment_method_controller_load('PaymentMethodBasicController'));
     $payment_method->enabled = FALSE;
-    $this->XtoolsAssertEntityPermission($payment_method, 'disabled payment method', 'payment_method_access', 'enable', array('payment.method.update.own'));
+    $this->XtoolsAssertEntityPermission($payment_method, 'disabled payment method', 'payment_method_access', 'enable', array('payment.payment_method.update.own'));
 
     // Disable a disabled payment method that belongs to user 1.
     $payment_method = $this->paymentMethodCreate(1, payment_method_controller_load('PaymentMethodBasicController'));
     $payment_method->enabled = FALSE;
-    $this->XtoolsAssertEntityPermission($payment_method, 'disabled payment method', 'payment_method_access', 'disable', array('payment.method.update.any'), array(
+    $this->XtoolsAssertEntityPermission($payment_method, 'disabled payment method', 'payment_method_access', 'disable', array('payment.payment_method.update.any'), array(
       'root' => FALSE,
       'authenticated_with_permissions' => FALSE,
     ));
@@ -65,29 +65,29 @@ class PaymentMethodEntityPermissionWebTestCase extends PaymentWebTestCase {
     // Disable a disabled payment method that belongs to user 2.
     $payment_method = $this->paymentMethodCreate(2, payment_method_controller_load('PaymentMethodBasicController'));
     $payment_method->enabled = FALSE;
-    $this->XtoolsAssertEntityPermission($payment_method, 'disabled payment method', 'payment_method_access', 'disable', array('payment.method.update.own'), array(
+    $this->XtoolsAssertEntityPermission($payment_method, 'disabled payment method', 'payment_method_access', 'disable', array('payment.payment_method.update.own'), array(
       'root' => FALSE,
       'authenticated_with_permissions' => FALSE,
     ));
 
     // Disable an enabled payment method that belongs to user 1.
     $payment_method = $this->paymentMethodCreate(1, payment_method_controller_load('PaymentMethodBasicController'));
-    $this->XtoolsAssertEntityPermission($payment_method, 'disabled payment method', 'payment_method_access', 'disable', array('payment.method.update.any'));
+    $this->XtoolsAssertEntityPermission($payment_method, 'disabled payment method', 'payment_method_access', 'disable', array('payment.payment_method.update.any'));
 
     // Enable am enabled payment method that belongs to user 2.
     $payment_method = $this->paymentMethodCreate(2, payment_method_controller_load('PaymentMethodBasicController'));
-    $this->XtoolsAssertEntityPermission($payment_method, 'disabled payment method', 'payment_method_access', 'disable', array('payment.method.update.own'));
+    $this->XtoolsAssertEntityPermission($payment_method, 'disabled payment method', 'payment_method_access', 'disable', array('payment.payment_method.update.own'));
 
     // Clone a payment method that belongs to user 1.
-    $this->XtoolsAssertEntityPermission($this->paymentMethodCreate(1, payment_method_controller_load('PaymentMethodBasicController')), 'payment method', 'payment_method_access', 'clone', array('payment.method.view.any', 'payment.method.create.PaymentMethodBasicController'));
+    $this->XtoolsAssertEntityPermission($this->paymentMethodCreate(1, payment_method_controller_load('PaymentMethodBasicController')), 'payment method', 'payment_method_access', 'clone', array('payment.payment_method.view.any', 'payment.payment_method.create.PaymentMethodBasicController'));
 
     // Clone a payment method that belongs to user 2.
-    $this->XtoolsAssertEntityPermission($this->paymentMethodCreate(2, payment_method_controller_load('PaymentMethodBasicController')), 'payment method', 'payment_method_access', 'clone', array('payment.method.view.own', 'payment.method.create.PaymentMethodBasicController'));
+    $this->XtoolsAssertEntityPermission($this->paymentMethodCreate(2, payment_method_controller_load('PaymentMethodBasicController')), 'payment method', 'payment_method_access', 'clone', array('payment.payment_method.view.own', 'payment.payment_method.create.PaymentMethodBasicController'));
 
     // View a payment method that belongs to user 1.
-    $this->XtoolsAssertEntityPermission($this->paymentMethodCreate(1, payment_method_controller_load('PaymentMethodBasicController')), 'payment method', 'payment_method_access', 'view', array('payment.method.view.any'));
+    $this->XtoolsAssertEntityPermission($this->paymentMethodCreate(1, payment_method_controller_load('PaymentMethodBasicController')), 'payment method', 'payment_method_access', 'view', array('payment.payment_method.view.any'));
 
     // View a payment method that belongs to user 2.
-    $this->XtoolsAssertEntityPermission($this->paymentMethodCreate(2, payment_method_controller_load('PaymentMethodBasicController')), 'payment method', 'payment_method_access', 'view', array('payment.method.view.own'));
+    $this->XtoolsAssertEntityPermission($this->paymentMethodCreate(2, payment_method_controller_load('PaymentMethodBasicController')), 'payment method', 'payment_method_access', 'view', array('payment.payment_method.view.own'));
   }
 }
\ No newline at end of file
diff --git a/payment/tests/payment_test/tests/PaymentMethodMenuRouterItemPermissionWebTestCase.test b/payment/tests/payment_test/tests/PaymentMethodMenuRouterItemPermissionWebTestCase.test
index d4a9a6a..3d3d164 100644
--- a/payment/tests/payment_test/tests/PaymentMethodMenuRouterItemPermissionWebTestCase.test
+++ b/payment/tests/payment_test/tests/PaymentMethodMenuRouterItemPermissionWebTestCase.test
@@ -19,37 +19,37 @@ class PaymentMethodMenuRouterItemPermissionWebTestCase extends PaymentWebTestCas
     $payment_method_2 = $this->paymentMethodCreate(2, payment_method_controller_load('PaymentMethodBasicController'));
 
     // Test the payment method overview (Views disabled).
-    $this->XtoolsAssertMenuRouterItemPermission('admin/config/services/payment/method', array('payment.method.view.any'), array(), 'Views disabled');
+    $this->XtoolsAssertMenuRouterItemPermission('admin/config/services/payment/method', array('payment.payment_method.view.any'), array(), 'Views disabled');
 
     // Enable Views.
     $this->assertTrue(module_enable(array('views')), 'Enabled modules: <em>views</em>');
     $this->resetAll();
 
     // Test the payment method overview (Views enabled).
-    $this->XtoolsAssertMenuRouterItemPermission('admin/config/services/payment/method', array('payment.method.view.any'), array(), 'Views enabled');
+    $this->XtoolsAssertMenuRouterItemPermission('admin/config/services/payment/method', array('payment.payment_method.view.any'), array(), 'Views enabled');
 
     // Test the payment method controller selection page.
-    $this->XtoolsAssertMenuRouterItemPermission('admin/config/services/payment/method/add', array('payment.method.create.PaymentMethodBasicController'));
+    $this->XtoolsAssertMenuRouterItemPermission('admin/config/services/payment/method/add', array('payment.payment_method.create.PaymentMethodBasicController'));
 
     // Test the payment method add page.
-    $this->XtoolsAssertMenuRouterItemPermission('admin/config/services/payment/method/add/PaymentMethodBasicController', array('payment.method.create.PaymentMethodBasicController'));
+    $this->XtoolsAssertMenuRouterItemPermission('admin/config/services/payment/method/add/PaymentMethodBasicController', array('payment.payment_method.create.PaymentMethodBasicController'));
 
     // Test the payment method edit page for a payment method that belongs to user 1.
-    $this->XtoolsAssertMenuRouterItemPermission('admin/config/services/payment/method/' . $payment_method_1->pmid . '/edit', array('payment.method.update.any'));
+    $this->XtoolsAssertMenuRouterItemPermission('admin/config/services/payment/method/' . $payment_method_1->pmid . '/edit', array('payment.payment_method.update.any'));
 
     // Test the payment method edit page for a payment method that belongs to user 2.
-    $this->XtoolsAssertMenuRouterItemPermission('admin/config/services/payment/method/' . $payment_method_2->pmid . '/edit', array('payment.method.update.own'));
+    $this->XtoolsAssertMenuRouterItemPermission('admin/config/services/payment/method/' . $payment_method_2->pmid . '/edit', array('payment.payment_method.update.own'));
 
     // Test the payment method delete page for a payment method that belongs to user 1.
-    $this->XtoolsAssertMenuRouterItemPermission('admin/config/services/payment/method/' . $payment_method_1->pmid . '/delete', array('payment.method.delete.any'));
+    $this->XtoolsAssertMenuRouterItemPermission('admin/config/services/payment/method/' . $payment_method_1->pmid . '/delete', array('payment.payment_method.delete.any'));
 
     // Test the payment method delete page for a payment method that belongs to user 2.
-    $this->XtoolsAssertMenuRouterItemPermission('admin/config/services/payment/method/' . $payment_method_2->pmid . '/delete', array('payment.method.delete.own'));
+    $this->XtoolsAssertMenuRouterItemPermission('admin/config/services/payment/method/' . $payment_method_2->pmid . '/delete', array('payment.payment_method.delete.own'));
 
     // Test the payment method clone page for a payment method that belongs to user 1.
-    $this->XtoolsAssertMenuRouterItemPermission('admin/config/services/payment/method/' . $payment_method_1->pmid . '/clone', array('payment.method.view.any', 'payment.method.create.' . $payment_method_1->controller->name));
+    $this->XtoolsAssertMenuRouterItemPermission('admin/config/services/payment/method/' . $payment_method_1->pmid . '/clone', array('payment.payment_method.view.any', 'payment.payment_method.create.' . $payment_method_1->controller->name));
 
     // Test the payment method clone page for a payment method that belongs to user 2.
-    $this->XtoolsAssertMenuRouterItemPermission('admin/config/services/payment/method/' . $payment_method_2->pmid . '/clone', array('payment.method.view.own', 'payment.method.create.' . $payment_method_2->controller->name));
+    $this->XtoolsAssertMenuRouterItemPermission('admin/config/services/payment/method/' . $payment_method_2->pmid . '/clone', array('payment.payment_method.view.own', 'payment.payment_method.create.' . $payment_method_2->controller->name));
   }
 }
\ No newline at end of file
diff --git a/payment/views/payment.views_default.inc b/payment/views/payment.views_default.inc
index 41ddbca..18f32fd 100644
--- a/payment/views/payment.views_default.inc
+++ b/payment/views/payment.views_default.inc
@@ -40,7 +40,7 @@ function payment_view_payments() {
   $handler->display->display_options['title'] = 'Payments';
   $handler->display->display_options['group_by'] = TRUE;
   $handler->display->display_options['access']['type'] = 'perm';
-  $handler->display->display_options['access']['perm'] = 'payment.view.own';
+  $handler->display->display_options['access']['perm'] = 'payment.payment.view.own';
   $handler->display->display_options['cache']['type'] = 'none';
   $handler->display->display_options['query']['type'] = 'views_query';
   $handler->display->display_options['query']['options']['query_comment'] = FALSE;
@@ -236,7 +236,7 @@ function payment_view_payments() {
   $handler = $view->new_display('page', 'Administration page', 'page_1');
   $handler->display->display_options['defaults']['access'] = FALSE;
   $handler->display->display_options['access']['type'] = 'perm';
-  $handler->display->display_options['access']['perm'] = 'payment.view.any';
+  $handler->display->display_options['access']['perm'] = 'payment.payment.view.any';
   $handler->display->display_options['defaults']['fields'] = FALSE;
   /* Field: Payment: Last updated date and time */
   $handler->display->display_options['fields']['updated']['id'] = 'updated';
@@ -366,7 +366,7 @@ function payment_view_payments() {
   $handler = $view->new_display('page', 'User\'s own payments', 'page_2');
   $handler->display->display_options['defaults']['access'] = FALSE;
   $handler->display->display_options['access']['type'] = 'perm';
-  $handler->display->display_options['access']['perm'] = 'payment.view.own';
+  $handler->display->display_options['access']['perm'] = 'payment.payment.view.own';
   $handler->display->display_options['defaults']['fields'] = FALSE;
   /* Field: Payment: Last updated date and time */
   $handler->display->display_options['fields']['updated']['id'] = 'updated';
@@ -555,7 +555,7 @@ function payment_view_payment_methods() {
   $handler = $view->new_display('default', 'Master', 'default');
   $handler->display->display_options['title'] = 'Payment methods';
   $handler->display->display_options['access']['type'] = 'perm';
-  $handler->display->display_options['access']['perm'] = 'payment.method.view.any';
+  $handler->display->display_options['access']['perm'] = 'payment.payment_method.view.any';
   $handler->display->display_options['cache']['type'] = 'none';
   $handler->display->display_options['query']['type'] = 'views_query';
   $handler->display->display_options['query']['options']['query_comment'] = FALSE;