diff --git a/README.txt b/README.txt
index 9ba7cbb..86227b8 100644
--- a/README.txt
+++ b/README.txt
@@ -1,10 +1,10 @@
 ABOUT
 -----
 
-The Contact Attach module gives users the ability of attaching one or more files
-to e-mail messages sent using the site-wide contact form or the user contact
-forms. Allowed extensions, maximum file size and number of attachments can be
-defined on a per-role basis for both the site-wide contact form and user
+The Contact Attach module gives users the ability of attaching files to messages
+sent using either the site-wide contact form or the personal contact forms of
+users. Allowed extensions, maximum file size and number of attachments can be
+defined on a per-role basis for both the site-wide contact form and personal
 contact forms.
 
 CREDITS
@@ -26,6 +26,7 @@ INSTALLATION AND CONFIGURATION
 In order to use this module, you will need to do the following:
  - Install the module in the usual way.
  - Grant permissions to attach files on contact forms on the permissions page.
-   These permissions will be listed under 'Contact Attach'.
- - Configure the settings on the admin/config/media/contact_attach page. Roles
-   listed here are those that have permissions to attach files on contact forms.
+   These permissions will be listed in the section headlined by the module name.
+ - Configure the settings on the Contact form attachments page
+   (admin/config/media/contact_attach). Roles listed here are those that have
+   permissions to attach files on contact forms.
diff --git a/contact_attach.admin.inc b/contact_attach.admin.inc
index 7f75c6a..982fa8d 100644
--- a/contact_attach.admin.inc
+++ b/contact_attach.admin.inc
@@ -15,7 +15,7 @@ function contact_attach_admin_settings() {
 
   $form['contact_attach_contact_forms'] = array(
     '#type' => 'value',
-    '#value' => array('site' => t('site-wide contact form'), 'user' => t('user contact forms')),
+    '#value' => array('site' => t('site-wide contact form'), 'user' => t('personal contact forms')),
   );
 
   foreach ($form['contact_attach_contact_forms']['#value'] as $contact_form_short => $contact_form_long) {
@@ -31,7 +31,7 @@ function contact_attach_admin_settings() {
 
     // array_flip() so that the key is a string. This prevents array_merge()
     // from changing the key.
-    $roles = array_flip(user_roles(FALSE, 'send attachments with ' . $contact_form_long));
+    $roles = array_flip(user_roles(FALSE, 'attach files on ' . $contact_form_long));
     // If the authenticated user role has the permission, add in all roles that
     // indirectly get the permission (all roles except the anonymous user role).
     $indirect_roles = in_array(DRUPAL_AUTHENTICATED_RID, $roles, TRUE) ? array_flip(user_roles(TRUE)) : array();
@@ -68,7 +68,7 @@ function contact_attach_admin_settings() {
         '#title' => t('Permitted file extensions'),
         '#default_value' => !empty($contact_attach_extensions[$rid]) ? $contact_attach_extensions[$rid] : CONTACT_ATTACH_DEFAULT_EXTENSIONS,
         '#maxlength' => 255,
-        '#description' => t('Extensions that users in this role can attach. Separate extensions with a space and do not include the leading dot.'),
+        '#description' => t('Extensions that users with this role can attach. Separate extensions with a space and do not include the leading dot.'),
       );
       $form['settings_' . $contact_form_short . '_form']['settings_role_' . $contact_form_short . '_' . $rid]['contact_attach_uploadsize_' . $contact_form_short] = array(
         '#tree' => TRUE,
@@ -79,7 +79,7 @@ function contact_attach_admin_settings() {
         '#default_value' => !empty($contact_attach_uploadsizes[$rid]) ? $contact_attach_uploadsizes[$rid] : CONTACT_ATTACH_DEFAULT_UPLOADSIZE,
         '#size' => 5,
         '#maxlength' => 12,
-        '#description' => t('The maximum size of a file a user in this role can attach.'),
+        '#description' => t('The maximum size of a file a user with this role can attach.'),
         '#field_suffix' => t('MB'),
       );
     }
@@ -105,7 +105,7 @@ function contact_attach_admin_settings_validate($form, &$form_state) {
         form_set_error('contact_attach_number_' . $contact_form_short . '][' . $rid, t('The number of attachments for %role must be a positive whole number.', array('%role' => $role)));
       }
       elseif ($form_state['values']['contact_attach_number_' . $contact_form_short][$rid] === '0') {
-        form_set_error('contact_attach_number_' . $contact_form_short . '][' . $rid, t('The number of attachments for %role can not be 0. If you want to disable attachments for a role, revoke its permission on the !permissions page.', array('%role' => $role, '!permissions' => l(t('permissions'), 'admin/people/permissions'))));
+        form_set_error('contact_attach_number_' . $contact_form_short . '][' . $rid, t('The number of attachments for %role can not be 0. If you want to disable the ability of attaching files on contact forms for a role, revoke its permission on the !permissions page.', array('%role' => $role, '!permissions' => l(t('permissions'), 'admin/people/permissions'))));
       }
 
       if (!is_numeric($uploadsize) || ($uploadsize <= 0)) {
diff --git a/contact_attach.info b/contact_attach.info
index fbf9ac9..1a0c4c0 100644
--- a/contact_attach.info
+++ b/contact_attach.info
@@ -1,5 +1,5 @@
 name = Contact Attach
-description = Gives users the ability of attaching one or more files to e-mails sent using the site-wide contact form and the users' individual contact form.
+description = Gives users the ability of attaching files to messages sent using either the site-wide contact form or the personal contact forms of users.
 core = 7.x
 dependencies[] = contact
 configure = admin/config/media/contact_attach
diff --git a/contact_attach.module b/contact_attach.module
index 5d1f113..da5a3e1 100644
--- a/contact_attach.module
+++ b/contact_attach.module
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Allows attaching files to e-mails sent using contact forms.
+ * Allows attaching files to messages sent using contact forms.
  *
- * This module gives users the ability of attaching one or more files to e-mails
- * sent using the site-wide contact form or a user's personal contact form.
+ * This module gives users the ability of attaching files to messages sent using
+ * the site-wide contact form or a user's personal contact form.
  */
 
 /**
@@ -29,7 +29,7 @@ define('CONTACT_ATTACH_DEFAULT_UPLOADSIZE', 0.0009765625);
 function contact_attach_help($path, $arg) {
   switch ($path) {
     case 'admin/config/media/contact_attach':
-      return '<p>' . t("The roles that are listed here are those that have the necessary permissions to send attachments from the specified form. To make a role appear here so that the settings for that role can be changed, grant the necessary permissions under 'Contact Attach' on the !permissions page.", array('!permissions' => l(t('permissions'), 'admin/people/permissions'))) . '</p>';
+      return '<p>' . t("The roles that are listed here are those that have the necessary permissions to attach files on the specified contact form. To make a role appear here so that the settings for that role can be changed, grant the necessary permissions in the module's section on the !permissions page.", array('!permissions' => l(t('permissions'), 'admin/people/permissions'))) . '</p>';
   }
 }
 
@@ -38,13 +38,13 @@ function contact_attach_help($path, $arg) {
  */
 function contact_attach_permission() {
   $allowed_permissions = array(
-    'send attachments with site-wide contact form' => array(
-      'title' => t('Send attachments with site-wide contact form'),
-      'description' => t('Send e-mails with attachments from the site-wide contact form.'),
+    'attach files on site-wide contact form' => array(
+      'title' => t('Attach files on the site-wide contact form'),
+      'description' => t('Send messages with attachments from the site-wide contact form.'),
     ),
-    'send attachments with user contact forms' => array(
-      'title' => t('Send attachments with user contact forms'),
-      'description' => t('Send e-mails with attachments from user contact forms.'),
+    'attach files on personal contact forms' => array(
+      'title' => t('Attach files on personal contact forms'),
+      'description' => t('Send messages with attachments from personal contact forms.'),
     ),
   );
 
@@ -56,8 +56,8 @@ function contact_attach_permission() {
  */
 function contact_attach_menu() {
   $items['admin/config/media/contact_attach'] = array(
-    'title' => 'Contact attach',
-    'description' => 'Configure the Contact Attach module.',
+    'title' => 'Contact form attachments',
+    'description' => 'Configure settings for attaching files on contact forms.',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('contact_attach_admin_settings'),
     'access arguments' => array('administer site configuration'),
@@ -71,7 +71,7 @@ function contact_attach_menu() {
  * Implements hook_form_alter().
  */
 function contact_attach_form_alter(&$form, &$form_state, $form_id) {
-  if (($form_id === 'contact_personal_form' && user_access('send attachments with user contact forms')) || ($form_id === 'contact_site_form' && user_access('send attachments with site-wide contact form'))) {
+  if (($form_id === 'contact_personal_form' && user_access('attach files on personal contact forms')) || ($form_id === 'contact_site_form' && user_access('attach files on site-wide contact form'))) {
     switch ($form_id) {
       case 'contact_site_form':
         $contact_form_short = 'site';
@@ -79,7 +79,7 @@ function contact_attach_form_alter(&$form, &$form_state, $form_id) {
         break;
       case 'contact_personal_form':
         $contact_form_short = 'user';
-        $contact_form_long = t('user contact forms');
+        $contact_form_long = t('personal contact forms');
         break;
     }
     // Send this along so that we don't need to figure this out again in the
@@ -380,7 +380,7 @@ function _contact_attach_add_attachment($file) {
 function _contact_attach_get_valid_roles($contact_form, $contact_attach_numbers) {
   global $user;
 
-  $permitted_roles = user_roles(FALSE, 'send attachments with ' . $contact_form);
+  $permitted_roles = user_roles(FALSE, 'attach files on ' . $contact_form);
   if (count($user->roles) === 1) {
     $roles = array_keys($user->roles);
   }
diff --git a/contact_attach.test b/contact_attach.test
index b87dd0a..aa7170a 100644
--- a/contact_attach.test
+++ b/contact_attach.test
@@ -39,7 +39,7 @@ class ContactAttachSettingsFormTestCase extends DrupalWebTestCase {
     $this->drupalGet('admin/config/media/contact_attach');
     $this->assertResponse(200);
     $this->assertUniqueText(t('Settings for site-wide contact form'));
-    $this->assertUniqueText(t('Settings for user contact forms'));
+    $this->assertUniqueText(t('Settings for personal contact forms'));
 
     // Check that the administrator role is listed on the settings page even
     // when not having set permissions and test that we can define its settings.
@@ -92,8 +92,8 @@ class ContactAttachSettingsFormTestCase extends DrupalWebTestCase {
   function checkPermittedRoleOnSettingsPage($rid, $grant_perms = TRUE) {
     if ($grant_perms) {
       user_role_grant_permissions($rid, array(
-        'send attachments with site-wide contact form',
-        'send attachments with user contact forms',
+        'attach files on site-wide contact form',
+        'attach files on personal contact forms',
       ));
     }
     $this->drupalGet('admin/config/media/contact_attach');
@@ -113,8 +113,8 @@ class ContactAttachSettingsFormTestCase extends DrupalWebTestCase {
    */
   function revokePermsAndCheckIfRoleNotListed($role, $extra_role_names = array()) {
     user_role_revoke_permissions($role->rid, array(
-      'send attachments with site-wide contact form',
-      'send attachments with user contact forms',
+      'attach files on site-wide contact form',
+      'attach files on personal contact forms',
     ));
     $this->drupalGet('admin/config/media/contact_attach');
     $this->assertNoText(t('Settings for @role', array('@role' => $role->name)));
@@ -172,7 +172,7 @@ class ContactAttachSettingsFormTestCase extends DrupalWebTestCase {
     $this->assertNoText(t('The configuration options have been saved.'), 'Settings NOT successfully saved.');
     $this->assertUniqueText(t('The number of attachments for @role must be a positive whole number.', array('@role' => $role->name)), 'Setting rightfully failed validation.');
     $this->assertNoUniqueText(t('The @role file size limit must be a number and greater than zero.', array('@role' => $role->name)), 'Setting rightfully failed validation.');
-    $this->assertUniqueText(t('The number of attachments for @role can not be 0. If you want to disable attachments for a role, revoke its permission on the permissions page.', array('@role' => $role->name)), 'Setting rightfully failed validation.');
+    $this->assertUniqueText(t('The number of attachments for @role can not be 0. If you want to disable the ability of attaching files on contact forms for a role, revoke its permission on the permissions page.', array('@role' => $role->name)), 'Setting rightfully failed validation.');
 
     $edit = array(
       'contact_attach_uploadsize_site[' . $role->rid . ']' => $max_size + 1,
@@ -280,8 +280,8 @@ class ContactAttachContactFormsTestCase extends DrupalWebTestCase {
    */
   function testContactAttachContactForms() {
     $this->contact_forms = array(
-      'contact' => 'send attachments with site-wide contact form',
-      'user/' . $this->admin_user->uid . '/contact' => 'send attachments with user contact forms',
+      'contact' => 'attach files on site-wide contact form',
+      'user/' . $this->admin_user->uid . '/contact' => 'attach files on personal contact forms',
     );
     $this->contact_forms_short = array(
       'site' => 'contact',
@@ -294,7 +294,7 @@ class ContactAttachContactFormsTestCase extends DrupalWebTestCase {
       'message' => "This is a test message with 1 attachment.",
     );
 
-    // Check the existence of attachment fields on the site-wide and user
+    // Check the existence of attachment fields on the site-wide and personal
     // contact forms with and without permissions granted.
     $this->checkExistenceOfAttachmentFields(DRUPAL_ANONYMOUS_RID);
     $this->checkExistenceOfAttachmentFields(DRUPAL_AUTHENTICATED_RID, $this->auth_user);
@@ -419,7 +419,7 @@ class ContactAttachContactFormsTestCase extends DrupalWebTestCase {
         $contact_form_long = 'site-wide contact form';
       }
       elseif ($contact_form_short === 'user') {
-        $contact_form_long = 'user contact forms';
+        $contact_form_long = 'personal contact forms';
       }
       $this->attachment_numbers[$rid] = $contact_attach_number;
       variable_set('contact_attach_number_' . $contact_form_short, $this->attachment_numbers);
@@ -459,7 +459,7 @@ class ContactAttachContactFormsTestCase extends DrupalWebTestCase {
         $mail_subject_start = '[Website feedback] ';
       }
       elseif ($contact_form_short === 'user') {
-        $contact_form_long = 'user contact forms';
+        $contact_form_long = 'personal contact forms';
         $mail_id = 'contact_user_mail';
         $mail_subject_start = '[Drupal] ';
       }
@@ -528,7 +528,7 @@ class ContactAttachContactFormsTestCase extends DrupalWebTestCase {
         'from' => $this->message['mail'],
         'subject' => $mail_subject_start . $this->message['subject'],
       ));
-      $this->assertEqual(count($captured_email), 1, t('One mail successfully sent.'));
+      $this->assertEqual(count($captured_email), 1, 'One mail successfully sent.');
       list( , $boundary_id) = explode('"', $captured_email[0]['headers']['Content-Type']);
       $this->assertEqual(substr_count($captured_email[0]['body'], $boundary_id), 3, 'Boundary ID appears 3 times in the sent message.');
       $attachment = "--$boundary_id\n" . _contact_attach_add_attachment($file) . "\n\n--$boundary_id--\n";