diff --git a/includes/wc-template-functions.php b/includes/wc-template-functions.php
index b3a201eeb65..dc06cf17590 100644
--- a/includes/wc-template-functions.php
+++ b/includes/wc-template-functions.php
@@ -578,8 +578,10 @@ if (  ! function_exists( 'woocommerce_template_loop_product_title' ) ) {
 	/**
 	 * Show the product title in the product loop. By default this is an H3.
 	 */
-	function woocommerce_template_loop_product_title() {
-		echo '<h3>' . get_the_title() . '</h3>';
+       function woocommerce_template_loop_product_title() {
+               $tag = is_product_taxonomy() || is_shop() ? 'h2' : 'h3';
+
+		echo '<' . $tag . ' class="woocommerce-loop-product__title">' . get_the_title() . '</' . $tag . '>';
 	}
 }
 if (  ! function_exists( 'woocommerce_template_loop_category_title' ) ) {
@@ -589,14 +591,14 @@ if (  ! function_exists( 'woocommerce_template_loop_category_title' ) ) {
 	 */
 	function woocommerce_template_loop_category_title( $category ) {
 		?>
-		<h3>
+		<h2 class="woocommerce-loop-category__title">
 			<?php
 				echo $category->name;
 
 				if ( $category->count > 0 )
 					echo apply_filters( 'woocommerce_subcategory_count_html', ' <mark class="count">(' . $category->count . ')</mark>', $category );
 			?>
-		</h3>
+		</h2>
 		<?php
 	}
 }
diff --git a/templates/single-product-reviews.php b/templates/single-product-reviews.php
index ae12795061a..e573a00595a 100644
--- a/templates/single-product-reviews.php
+++ b/templates/single-product-reviews.php
@@ -30,7 +30,7 @@ if ( ! comments_open() ) {
 	<div id="comments">
 		<h2 class="woocommerce-Reviews-title"><?php
 			if ( get_option( 'woocommerce_enable_review_rating' ) === 'yes' && ( $count = $product->get_review_count() ) )
-				printf( _n( '%s review for %s%s%s', '%s reviews for %s%s%s', $count, 'woocommerce' ), $count, '<span>', get_the_title(), '</span>' );
+				printf( esc_html( _n( '%s review for %s%s%s', '%s reviews for %s%s%s', $count, 'woocommerce' ) ), $count, '<span>', get_the_title(), '</span>' );
 			else
 				_e( 'Reviews', 'woocommerce' );
 		?></h2>
@@ -67,7 +67,9 @@ if ( ! comments_open() ) {
 
 					$comment_form = array(
 						'title_reply'          => have_comments() ? __( 'Add a review', 'woocommerce' ) : sprintf( __( 'Be the first to review &ldquo;%s&rdquo;', 'woocommerce' ), get_the_title() ),
-						'title_reply_to'       => __( 'Leave a Reply to %s', 'woocommerce' ),
+                                               'title_reply_to'       => __( 'Leave a Reply to %s', 'woocommerce' ),
+                                               'title_reply_before'   => '<span id="reply-title" class="comment-reply-title">',
+                                               'title_reply_after'    => '</span>',
 						'comment_notes_after'  => '',
 						'fields'               => array(
 							'author' => '<p class="comment-form-author">' . '<label for="author">' . __( 'Name', 'woocommerce' ) . ' <span class="required">*</span></label> ' .
diff --git a/templates/single-product/related.php b/templates/single-product/related.php
index 010c37c912d..63c902925f6 100644
--- a/templates/single-product/related.php
+++ b/templates/single-product/related.php
@@ -46,9 +46,9 @@ $woocommerce_loop['columns'] = apply_filters( 'woocommerce_related_products_colu
 
 if ( $products->have_posts() ) : ?>
 
-	<div class="related products">
+	<section class="related products">
 
-		<h2><?php _e( 'Related Products', 'woocommerce' ); ?></h2>
+		<h2><?php esc_html_e( 'Related Products', 'woocommerce' ); ?></h2>
 
 		<?php woocommerce_product_loop_start(); ?>
 
@@ -60,7 +60,7 @@ if ( $products->have_posts() ) : ?>
 
 		<?php woocommerce_product_loop_end(); ?>
 
-	</div>
+	</section>
 
 <?php endif;
 
diff --git a/templates/single-product/tabs/additional-information.php b/templates/single-product/tabs/additional-information.php
index 07b0fef3417..ba2a9ea7a1a 100644
--- a/templates/single-product/tabs/additional-information.php
+++ b/templates/single-product/tabs/additional-information.php
@@ -22,7 +22,7 @@ if ( ! defined( 'ABSPATH' ) ) {
 
 global $product;
 
-$heading = apply_filters( 'woocommerce_product_additional_information_heading', __( 'Additional Information', 'woocommerce' ) );
+$heading = esc_html( apply_filters( 'woocommerce_product_additional_information_heading', __( 'Additional Information', 'woocommerce' ) ) );
 
 ?>
 
diff --git a/templates/single-product/tabs/description.php b/templates/single-product/tabs/description.php
index a2d41b22983..036f380757d 100644
--- a/templates/single-product/tabs/description.php
+++ b/templates/single-product/tabs/description.php
@@ -22,7 +22,7 @@ if ( ! defined( 'ABSPATH' ) ) {
 
 global $post;
 
-$heading = esc_html( apply_filters( 'woocommerce_product_description_heading', __( 'Product Description', 'woocommerce' ) ) );
+$heading = esc_html( apply_filters( 'woocommerce_product_description_heading', __( 'Description', 'woocommerce' ) ) );
 
 ?>
 
diff --git a/templates/single-product/up-sells.php b/templates/single-product/up-sells.php
index 6b9a59dac5c..9464d5fc0d5 100644
--- a/templates/single-product/up-sells.php
+++ b/templates/single-product/up-sells.php
@@ -43,9 +43,9 @@ $woocommerce_loop['columns'] = apply_filters( 'woocommerce_up_sells_columns', $c
 
 if ( $products->have_posts() ) : ?>
 
-	<div class="up-sells upsells products">
+	<section class="up-sells upsells products">
 
-		<h2><?php _e( 'You may also like&hellip;', 'woocommerce' ) ?></h2>
+		<h2><?php esc_html_e( 'You may also like&hellip;', 'woocommerce' ) ?></h2>
 
 		<?php woocommerce_product_loop_start(); ?>
 
@@ -57,7 +57,7 @@ if ( $products->have_posts() ) : ?>
 
 		<?php woocommerce_product_loop_end(); ?>
 
-	</div>
+	</section>
 
 <?php endif;