diff --git a/wp-content/themes/twentyten/archive.php b/wp-content/themes/twentyten/archive.php
index 2c0ddc3a52..d9e7e0ad86 100644
--- a/wp-content/themes/twentyten/archive.php
+++ b/wp-content/themes/twentyten/archive.php
@@ -16,8 +16,13 @@
 <?php endif; ?>
 
 <?php rewind_posts(); ?>
-
-<?php get_generic_template( 'loop', 'archive' ); ?>
+<?php
+	/* Run the loop for the archives page to output the posts.
+	 * If you want to overload this in a child theme then include a file
+	 * called loop-archives.php and that will be used instead.
+	 */
+	 get_template_part( 'loop', 'archive' );
+?>
 
 			</div><!-- #content -->
 		</div><!-- #container -->
diff --git a/wp-content/themes/twentyten/author.php b/wp-content/themes/twentyten/author.php
index 300a8243f8..7f13b9ac6a 100644
--- a/wp-content/themes/twentyten/author.php
+++ b/wp-content/themes/twentyten/author.php
@@ -21,8 +21,13 @@
 
 <?php rewind_posts(); ?>
 
-<?php get_generic_template( 'loop', 'author' ); ?>
-
+<?php
+	/* Run the loop for the author archive page to output the authors posts
+	 * If you want to overload this in a child theme then include a file
+	 * called loop-author.php and that will be used instead.
+	 */
+	 get_template_part( 'loop', 'author' );
+?>
 			</div><!-- #content -->
 		</div><!-- #container -->
 
diff --git a/wp-content/themes/twentyten/category.php b/wp-content/themes/twentyten/category.php
index 32d9a2dcaa..33e80a0c4f 100644
--- a/wp-content/themes/twentyten/category.php
+++ b/wp-content/themes/twentyten/category.php
@@ -8,7 +8,13 @@
 				?></h1>
 				<?php $categorydesc = category_description(); if ( ! empty( $categorydesc ) ) echo apply_filters( 'archive_meta', '<div class="archive-meta">' . $categorydesc . '</div>' ); ?>
 
-<?php get_generic_template( 'loop', 'category' ); ?>
+				<?php
+				/* Run the loop for the category page to output the posts.
+				 * If you want to overload this in a child theme then include a file
+				 * called loop-category.php and that will be used instead.
+				 */
+				 get_template_part( 'loop', 'category' );
+				?>
 
 			</div><!-- #content -->
 		</div><!-- #container -->
diff --git a/wp-content/themes/twentyten/index.php b/wp-content/themes/twentyten/index.php
index cee8d62142..3f51e01551 100644
--- a/wp-content/themes/twentyten/index.php
+++ b/wp-content/themes/twentyten/index.php
@@ -3,8 +3,13 @@
 		<div id="container">
 			<div id="content">
 
-			<?php get_generic_template( 'loop', 'index' ); ?>
-
+			<?php
+			/* Run the loop to output the posts.
+			 * If you want to overload this in a child theme then include a file
+			 * called loop-index.php and that will be used instead.
+			 */
+			 get_template_part( 'loop', 'index' );
+			?>
 			</div><!-- #content -->
 		</div><!-- #container -->
 
diff --git a/wp-content/themes/twentyten/search.php b/wp-content/themes/twentyten/search.php
index d7715c4c54..ca63f552cf 100644
--- a/wp-content/themes/twentyten/search.php
+++ b/wp-content/themes/twentyten/search.php
@@ -5,7 +5,13 @@
 
 <?php if ( have_posts() ) : ?>
 				<h1 class="page-title"><?php printf( __( 'Search Results for: %s', 'twentyten' ), '<span>' . get_search_query() . '</span>' ); ?></h1>
-	<?php get_generic_template( 'loop', 'search' ); ?>
+				<?php
+				/* Run the loop for the search to output the results.
+				 * If you want to overload this in a child theme then include a file
+				 * called loop-search.php and that will be used instead.
+				 */
+				 get_template_part( 'loop', 'search' );
+				?>
 <?php else : ?>
 				<div id="post-0" class="post no-results not-found">
 					<h2 class="entry-title"><?php _e( 'Nothing Found', 'twentyten' ); ?></h2>
diff --git a/wp-content/themes/twentyten/tag.php b/wp-content/themes/twentyten/tag.php
index d4834146c7..83806bbd1c 100644
--- a/wp-content/themes/twentyten/tag.php
+++ b/wp-content/themes/twentyten/tag.php
@@ -11,8 +11,13 @@
 
 <?php rewind_posts(); ?>
 
-<?php get_generic_template( 'loop', 'tag' ); ?>
-
+<?php
+/* Run the loop for the tag archive to output the posts
+ * If you want to overload this in a child theme then include a file
+ * called loop-tag.php and that will be used instead.
+ */
+ get_template_part( 'loop', 'tag' );
+?>
 			</div><!-- #content -->
 		</div><!-- #container -->