diff --git a/src/wp-content/themes/twentynineteen/header.php b/src/wp-content/themes/twentynineteen/header.php
index 868a521944..b960fd4a99 100644
--- a/src/wp-content/themes/twentynineteen/header.php
+++ b/src/wp-content/themes/twentynineteen/header.php
@@ -28,7 +28,7 @@
 
 			<div class="site-branding-container">
 				<?php get_template_part( 'template-parts/header/site', 'branding' ); ?>
-			</div><!-- .layout-wrap -->
+			</div><!-- .site-branding-container -->
 
 			<?php if ( is_singular() && twentynineteen_can_show_post_thumbnail() ) : ?>
 				<div class="site-featured-image">
diff --git a/src/wp-content/themes/twentynineteen/image.php b/src/wp-content/themes/twentynineteen/image.php
index c27e26f6bb..000983ce74 100644
--- a/src/wp-content/themes/twentynineteen/image.php
+++ b/src/wp-content/themes/twentynineteen/image.php
@@ -78,7 +78,7 @@ get_header();
 						<?php twentynineteen_entry_footer(); ?>
 
 					</footer><!-- .entry-footer -->
-				</article><!-- #post-## -->
+				</article><!-- #post-<?php the_ID(); ?> -->
 
 				<?php
 				// Parent post navigation.
diff --git a/src/wp-content/themes/twentynineteen/template-parts/content/content-excerpt.php b/src/wp-content/themes/twentynineteen/template-parts/content/content-excerpt.php
index 98b0761ebb..a76edb02ed 100644
--- a/src/wp-content/themes/twentynineteen/template-parts/content/content-excerpt.php
+++ b/src/wp-content/themes/twentynineteen/template-parts/content/content-excerpt.php
@@ -30,4 +30,4 @@
 	<footer class="entry-footer">
 		<?php twentynineteen_entry_footer(); ?>
 	</footer><!-- .entry-footer -->
-</article><!-- #post-${ID} -->
+</article><!-- #post-<?php the_ID(); ?> -->
diff --git a/src/wp-content/themes/twentynineteen/template-parts/content/content-single.php b/src/wp-content/themes/twentynineteen/template-parts/content/content-single.php
index 720a253539..2e654dbcf9 100644
--- a/src/wp-content/themes/twentynineteen/template-parts/content/content-single.php
+++ b/src/wp-content/themes/twentynineteen/template-parts/content/content-single.php
@@ -52,4 +52,4 @@
 		<?php get_template_part( 'template-parts/post/author', 'bio' ); ?>
 	<?php endif; ?>
 
-</article><!-- #post-${ID} -->
+</article><!-- #post-<?php the_ID(); ?> -->
diff --git a/src/wp-content/themes/twentynineteen/template-parts/content/content.php b/src/wp-content/themes/twentynineteen/template-parts/content/content.php
index 85ec63287d..befcbda7f6 100644
--- a/src/wp-content/themes/twentynineteen/template-parts/content/content.php
+++ b/src/wp-content/themes/twentynineteen/template-parts/content/content.php
@@ -56,4 +56,4 @@
 	<footer class="entry-footer">
 		<?php twentynineteen_entry_footer(); ?>
 	</footer><!-- .entry-footer -->
-</article><!-- #post-${ID} -->
+</article><!-- #post-<?php the_ID(); ?> -->
diff --git a/src/wp-content/themes/twentynineteen/template-parts/header/entry-header.php b/src/wp-content/themes/twentynineteen/template-parts/header/entry-header.php
index 9a72cbfdca..b23ad31d73 100644
--- a/src/wp-content/themes/twentynineteen/template-parts/header/entry-header.php
+++ b/src/wp-content/themes/twentynineteen/template-parts/header/entry-header.php
@@ -42,5 +42,5 @@ $discussion = ! is_page() && twentynineteen_can_show_post_thumbnail() ? twentyni
 			'</span>'
 		);
 	?>
-</div><!-- .meta-info -->
+</div><!-- .entry-meta -->
 <?php endif; ?>