diff --git a/masquerade.module b/masquerade.module
index d551eeb..0d375b7 100644
--- a/masquerade.module
+++ b/masquerade.module
@@ -49,7 +49,7 @@ function masquerade_permission() {
   $roles = user_roles();
   foreach ($roles as $rid => $role) {
     if ($rid == DRUPAL_ANONYMOUS_RID) continue;
-    $perm_string = _masquerade_build_perm_string($rid);
+    $perm_string = _masquerade_build_perm_string($role);
     $perm_title = t('Masquerade as %role', array('%role' => $role));
     $perms[$perm_string] = array('title' => $perm_title, 'description' => $perm_title);
   }
@@ -957,8 +957,8 @@ function masquerade_switch_back() {
 /**
  * Generates a permission string for a given a role name.
  */
-function _masquerade_build_perm_string($rid) {
-  $perm = "masquerade as role {$rid}";
+function _masquerade_build_perm_string($role_name) {
+  $perm = "masquerade as role {$role_name}";
   return $perm;
 }
 
@@ -993,7 +993,7 @@ function _masquerade_user_access($account) {
 
   // return false on the first unmatched role
   foreach ($account->roles as $rid => $role) {
-    $permission = _masquerade_build_perm_string($rid);
+    $permission = _masquerade_build_perm_string($role);
     if (!(user_access($permission, $user))) {
       return FALSE;
     }
diff --git a/masquerade.test b/masquerade.test
index 1393147..4cf776a 100644
--- a/masquerade.test
+++ b/masquerade.test
@@ -30,7 +30,7 @@ class MasqueradeTestCase extends DrupalWebTestCase {
       'access user profiles',
       'masquerade as user',
       'masquerade as any user',
-      'masquerade as role ' . DRUPAL_AUTHENTICATED_RID,
+      'masquerade as role authenticated user',
     );
     $admin = $this->drupalCreateUser($admin_perms);
     $user = $this->drupalCreateUser();