diff --git a/comment_notify.inc b/comment_notify.inc
index 474e011..2bfd0e8 100644
--- a/comment_notify.inc
+++ b/comment_notify.inc
@@ -221,7 +221,7 @@ function comment_notify_mark_comment_as_notified($comment) {
 /**
  * Unsubscribe all comment notification requests associated with an email.
  *
- * If the email belongs to a user, it will unsubscribe all of their comment notify records.
+ * If the email belongs to a user, it will unsubscribe all of their Comment Notify records.
  * If it does not, then it will unsubscribe all anonymous users.
  *
  * @param string $mail
diff --git a/comment_notify.info b/comment_notify.info
index e834fdd..5e1224b 100644
--- a/comment_notify.info
+++ b/comment_notify.info
@@ -1,4 +1,4 @@
-name = Comment notify
+name = Comment Notify
 description = "Comment follow-up e-mail notification for anonymous as well as registered users."
 dependencies[] = comment
 dependencies[] = token
diff --git a/comment_notify.install b/comment_notify.install
index ecb7bb2..fe18281 100644
--- a/comment_notify.install
+++ b/comment_notify.install
@@ -157,7 +157,7 @@ function comment_notify_update_7003() {
       variable_set($variable, $text);
     }
   }
-  return 'Comment notify token strings updated.';
+  return 'Comment Notify token strings updated.';
 }
 
 /**
diff --git a/comment_notify.module b/comment_notify.module
index 072bdb3..1efe67c 100644
--- a/comment_notify.module
+++ b/comment_notify.module
@@ -172,7 +172,7 @@ function comment_notify_permission() {
 function comment_notify_menu() {
 
   $items['admin/config/people/comment_notify'] = array(
-    'title' => 'Comment notify',
+    'title' => 'Comment Notify',
     'description' => 'Configure settings for e-mails about new comments.',
     'page callback' => 'drupal_get_form',
     'page arguments' => array('comment_notify_settings'),
@@ -729,16 +729,16 @@ function comment_notify_field_extra_fields() {
   foreach (comment_notify_variable_registry_get('node_types') as $node_type) {
     if (isset($node_type)) {
       $extras['comment']['comment_node_' . $node_type]['form']['comment_notify_settings'] = array(
-        'label' => t('Comment notify settings'),
-        'description' => t('@node_type settings for Comment notify', array('@node_type' => ucwords($node_type))),
+        'label' => t('Comment Notify settings'),
+        'description' => t('@node_type settings for Comment Notify', array('@node_type' => ucwords($node_type))),
         'weight' => 1,
       );
     }
   }
 
   $extras['user']['user']['form']['comment_notify_settings'] = array(
-    'label' => t('Comment notify settings'),
-    'description' => t('User settings for Comment notify'),
+    'label' => t('Comment Notify settings'),
+    'description' => t('User settings for Comment Notify'),
     'weight' => 4,
   );
   return $extras;