diff --git a/404.php b/404.php
index 6ed21cad..7ef02593 100644
--- a/404.php
+++ b/404.php
@@ -10,12 +10,12 @@ get_header(); ?>
 	<div id="primary" class="content-area">
 		<div id="content" class="site-content" role="main">
 
-			<article id="post-0" class="post not-found">
-				<header class="entry-header">
-					<h1 class="entry-title"><?php _e( 'Oops! That page can&rsquo;t be found.', '_s' ); ?></h1>
-				</header><!-- .entry-header -->
+			<section class="error-404 not-found">
+				<header class="page-header">
+					<h1 class="page-title"><?php _e( 'Oops! That page can&rsquo;t be found.', '_s' ); ?></h1>
+				</header><!-- .page-header -->
 
-				<div class="entry-content">
+				<div class="page-content">
 					<p><?php _e( 'It looks like nothing was found at this location. Maybe try one of the links below or a search?', '_s' ); ?></p>
 
 					<?php get_search_form(); ?>
@@ -47,8 +47,8 @@ get_header(); ?>
 
 					<?php the_widget( 'WP_Widget_Tag_Cloud' ); ?>
 
-				</div><!-- .entry-content -->
-			</article><!-- #post-0 .post .not-found -->
+				</div><!-- .page-content -->
+			</section><!-- .error404 .not-found -->
 
 		</div><!-- #content -->
 	</div><!-- #primary -->
diff --git a/no-results.php b/no-results.php
index da31bd76..6cd46b4c 100644
--- a/no-results.php
+++ b/no-results.php
@@ -8,12 +8,12 @@
  */
 ?>
 
-<article id="post-0" class="post no-results not-found">
-	<header class="entry-header">
-		<h1 class="entry-title"><?php _e( 'Nothing Found', '_s' ); ?></h1>
-	</header><!-- .entry-header -->
+<section class="no-results not-found">
+	<header class="page-header">
+		<h1 class="page-title"><?php _e( 'Nothing Found', '_s' ); ?></h1>
+	</header><!-- .page-header -->
 
-	<div class="entry-content">
+	<div class="page-content">
 		<?php if ( is_home() && current_user_can( 'publish_posts' ) ) : ?>
 
 			<p><?php printf( __( 'Ready to publish your first post? <a href="%1$s">Get started here</a>.', '_s' ), esc_url( admin_url( 'post-new.php' ) ) ); ?></p>
@@ -29,5 +29,5 @@
 			<?php get_search_form(); ?>
 
 		<?php endif; ?>
-	</div><!-- .entry-content -->
-</article><!-- #post-0 .post .no-results .not-found -->
+	</div><!-- .page-content -->
+</section><!-- .no-results -->