diff --git a/comments.php b/comments.php
index 058b1c94..2b6e7164 100644
--- a/comments.php
+++ b/comments.php
@@ -11,10 +11,10 @@
  * @since _s 1.0
  */
 ?>
-	<div id="comments">
+	<div id="comments" class="comments-area">
 	<?php if ( post_password_required() ) : ?>
 		<p class="nopassword"><?php _e( 'This post is password protected. Enter the password to view any comments.', '_s' ); ?></p>
-	</div><!-- #comments -->
+	</div><!-- #comments .comments-area -->
 	<?php
 			/* Stop the rest of comments.php from being processed,
 			 * but don't kill the script entirely -- we still have
@@ -27,7 +27,7 @@
 	<?php // You can start editing here -- including this comment! ?>
 
 	<?php if ( have_comments() ) : ?>
-		<h2 id="comments-title">
+		<h2 class="comments-title">
 			<?php
 				printf( _n( 'One thought on &ldquo;%2$s&rdquo;', '%1$s thoughts on &ldquo;%2$s&rdquo;', get_comments_number(), '_s' ),
 					number_format_i18n( get_comments_number() ), '<span>' . get_the_title() . '</span>' );
@@ -35,8 +35,8 @@
 		</h2>
 
 		<?php if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ) : // are there comments to navigate through ?>
-		<nav id="comment-nav-above">
-			<h1 class="assistive-text section-heading"><?php _e( 'Comment navigation', '_s' ); ?></h1>
+		<nav id="comment-nav-above" class="site-navigation comment-navigation">
+			<h1 class="assistive-text"><?php _e( 'Comment navigation', '_s' ); ?></h1>
 			<div class="nav-previous"><?php previous_comments_link( __( '&larr; Older Comments', '_s' ) ); ?></div>
 			<div class="nav-next"><?php next_comments_link( __( 'Newer Comments &rarr;', '_s' ) ); ?></div>
 		</nav>
@@ -55,8 +55,8 @@
 		</ol>
 
 		<?php if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ) : // are there comments to navigate through ?>
-		<nav id="comment-nav-below">
-			<h1 class="assistive-text section-heading"><?php _e( 'Comment navigation', '_s' ); ?></h1>
+		<nav id="comment-nav-below" class="site-navigation comment-navigation">
+			<h1 class="assistive-text"><?php _e( 'Comment navigation', '_s' ); ?></h1>
 			<div class="nav-previous"><?php previous_comments_link( __( '&larr; Older Comments', '_s' ) ); ?></div>
 			<div class="nav-next"><?php next_comments_link( __( 'Newer Comments &rarr;', '_s' ) ); ?></div>
 		</nav>
@@ -73,4 +73,4 @@
 
 	<?php comment_form(); ?>
 
-</div><!-- #comments -->
+</div><!-- #comments .comments-area -->