Index: wp-content/themes/twentytwelve/style.css
===================================================================
--- wp-content/themes/twentytwelve/style.css	(revision 21641)
+++ wp-content/themes/twentytwelve/style.css	(working copy)
@@ -1199,11 +1199,11 @@
 	margin-bottom: 14px;
 	margin-bottom: 1rem;
 }
-.page-template-homepage-php .site-content article {
+.page-template-page-templateshome-php .site-content article {
 	border: 0;
 	margin-bottom: 0;
 }
-.page-template-homepage-php .widget-area {
+.page-template-page-templateshome-php .widget-area {
 	clear: both;
 	float: none;
 	width: auto;
@@ -1211,7 +1211,7 @@
 	padding-top: 1.714285714rem;
 	border-top: 1px solid #ededed;
 }
-.page-template-homepage-php .widget-area .widget li {
+.page-template-page-templateshome-php .widget-area .widget li {
 	margin: 8px 0 0;
 	margin: 0.571428571rem 0 0;
 	font-size: 13px;
@@ -1220,13 +1220,13 @@
 	list-style-type: square;
 	list-style-position: inside;
 }
-.page-template-homepage-php .widget-area .widget li a {
+.page-template-page-templateshome-php .widget-area .widget li a {
 	color: #777;
 }
-.page-template-homepage-php .widget-area .widget li a:hover {
+.page-template-page-templateshome-php .widget-area .widget li a:hover {
 	color: #21759b;
 }
-.page-template-homepage-php .widget-area .widget_text img {
+.page-template-page-templateshome-php .widget-area .widget_text img {
 	float: left;
 	margin: 8px 24px 8px 0;
 	margin: 0.571428571rem 1.714285714rem 0.571428571rem 0;
@@ -1324,8 +1324,8 @@
 		float: left;
 		width: 65.104166667%;
 	}
-	body.page-template-full-width-page-php .site-content,
-	body.page-template-homepage-php .site-content,
+	body.page-template-page-templatesfull-width-php .site-content,
+	body.page-template-page-templateshome-php .site-content,
 	body.single-attachment .site-content,
 	body.full-width .site-content {
 		width: 100%;
@@ -1428,11 +1428,11 @@
 	#respond form textarea.blog-textarea {
 		width: 79.666666667%;
 	}
-	.page-template-homepage-php .site-content,
-	.page-template-homepage-php article {
+	.page-template-page-templateshome-php .site-content,
+	.page-template-page-templateshome-php article {
 		overflow: hidden;
 	}
-	.page-template-homepage-php.has-post-thumbnail article {
+	.page-template-page-templateshome-php.has-post-thumbnail article {
 		float: left;
 		width: 47.916666667%;
 	}
@@ -1441,25 +1441,25 @@
 		margin-bottom: 0;
 		width: 47.916666667%;
 	}
-	.page-template-homepage-php .widget-area .widget,
-	.page-template-homepage-php .widget-area.two .home-widgets {
+	.page-template-page-templateshome-php .widget-area .widget,
+	.page-template-page-templateshome-php .widget-area.two .home-widgets {
 		float: left;
 		width: 51.875%;
 		margin-bottom: 24px;
 		margin-bottom: 1.714285714rem;
 	}
-	.page-template-homepage-php .widget-area .widget:nth-child(odd) {
+	.page-template-page-templateshome-php .widget-area .widget:nth-child(odd) {
 		clear: right;
 	}
-	.page-template-homepage-php .widget-area .widget:nth-child(even),
-	.page-template-homepage-php .widget-area.two .home-widgets + .home-widgets {
+	.page-template-page-templateshome-php .widget-area .widget:nth-child(even),
+	.page-template-page-templateshome-php .widget-area.two .home-widgets + .home-widgets {
 		float: right;
 		width: 39.0625%;
 		margin: 0 0 24px;
 		margin: 0 0 1.714285714rem;
 	}
-	.page-template-homepage-php .widget-area.two .widget,
-	.page-template-homepage-php .widget-area.two .widget:nth-child(even) {
+	.page-template-page-templateshome-php .widget-area.two .widget,
+	.page-template-page-templateshome-php .widget-area.two .widget:nth-child(even) {
 		float: none;
 		width: auto;
 	}
Index: wp-content/themes/twentytwelve/full-width-page.php
===================================================================
--- wp-content/themes/twentytwelve/full-width-page.php	(revision 21641)
+++ wp-content/themes/twentytwelve/full-width-page.php	(working copy)
@@ -1,23 +0,0 @@
-<?php
-/**
- * Template Name: Full-width page, no sidebar
- *
- * @package WordPress
- * @subpackage Twenty_Twelve
- * @since Twenty Twelve 1.0
- */
-
-get_header(); ?>
-
-	<div id="primary" class="site-content">
-		<div id="content" role="main">
-
-			<?php while ( have_posts() ) : the_post(); ?>
-				<?php get_template_part( 'content', 'page' ); ?>
-				<?php comments_template( '', true ); ?>
-			<?php endwhile; // end of the loop. ?>
-
-		</div><!-- #content -->
-	</div><!-- #primary -->
-
-<?php get_footer(); ?>
\ No newline at end of file
Index: wp-content/themes/twentytwelve/rtl.css
===================================================================
--- wp-content/themes/twentytwelve/rtl.css	(revision 21641)
+++ wp-content/themes/twentytwelve/rtl.css	(working copy)
@@ -139,7 +139,7 @@
 /* =Home page template styling
 -------------------------------------------------------------- */
 
-.page-template-homepage-php .widget-area .widget_text img {
+.page-template-page-templateshome-php .widget-area .widget_text img {
 	float: right;
 	margin: 8px 0 8px 24px;
 	margin: 0.571428571rem 0 0.571428571rem 1.714285714rem;
@@ -178,7 +178,7 @@
 /* Minimum width of 600 pixels. */
 @media screen and (min-width: 600px) {
 	.site-content,
-	.page-template-homepage-php.has-post-thumbnail article {
+	.page-template-page-templateshome-php.has-post-thumbnail article {
 		float: right;
 	}
 	.widget-area,
@@ -193,19 +193,19 @@
 	.entry-summary p {
 		text-align: right;
 	}
-	.page-template-homepage-php .widget-area .widget_text img {
+	.page-template-page-templateshome-php .widget-area .widget_text img {
 		float: right;
 		margin: 8px 0 8px 24px;
 	}
-	.page-template-homepage-php .widget-area .widget,
-	.page-template-homepage-php .widget-area.two .home-widgets {
+	.page-template-page-templateshome-php .widget-area .widget,
+	.page-template-page-templateshome-php .widget-area.two .home-widgets {
 		float: right;
 	}
-	.page-template-homepage-php .widget-area .widget:nth-child(odd) {
+	.page-template-page-templateshome-php .widget-area .widget:nth-child(odd) {
 		clear: left;
 	}
-	.page-template-homepage-php .widget-area .widget:nth-child(even),
-	.page-template-homepage-php .widget-area.two .home-widgets + .home-widgets {
+	.page-template-page-templateshome-php .widget-area .widget:nth-child(even),
+	.page-template-page-templateshome-php .widget-area.two .home-widgets + .home-widgets {
 		float: left;
 		margin: 0 24px 0;
 		margin: 0 1.714285714rem 0;
Index: wp-content/themes/twentytwelve/functions.php
===================================================================
--- wp-content/themes/twentytwelve/functions.php	(revision 21641)
+++ wp-content/themes/twentytwelve/functions.php	(working copy)
@@ -362,10 +362,10 @@
 function twentytwelve_body_class( $classes ) {
 	$background_color = get_background_color();
 
-	if ( ! is_active_sidebar( 1 ) || is_page_template( 'full-width-page.php' ) )
+	if ( ! is_active_sidebar( 1 ) || is_page_template( 'page-templates/full-width-page.php' ) )
 		$classes[] = 'full-width';
 
-	if ( is_page_template( 'homepage.php' ) && has_post_thumbnail() )
+	if ( is_page_template( 'page-templates/home.php' ) && has_post_thumbnail() )
 		$classes[] = 'has-post-thumbnail';
 
 	if ( empty( $background_color ) )
@@ -384,7 +384,7 @@
  * @since Twenty Twelve 1.0
  */
 function twentytwelve_content_width() {
-	if ( is_page_template( 'full-width-page.php' ) || is_attachment() || ! is_active_sidebar( 1 ) ) {
+	if ( is_page_template( 'page-templates/full-width-page.php' ) || is_attachment() || ! is_active_sidebar( 1 ) ) {
 		global $content_width;
 		$content_width = 960;
 	}
Index: wp-content/themes/twentytwelve/page-templates/full-width-page.php
===================================================================
--- wp-content/themes/twentytwelve/page-templates/full-width-page.php	(revision 0)
+++ wp-content/themes/twentytwelve/page-templates/full-width-page.php	(working copy)
@@ -1,7 +1,9 @@
 <?php
 /**
- * Template Name: Full-width page, no sidebar
+ * Template Name: Full-width Page Template, No Sidebar
  *
+ * @todo Better documentation here.
+ *
  * @package WordPress
  * @subpackage Twenty_Twelve
  * @since Twenty Twelve 1.0
Index: wp-content/themes/twentytwelve/page-templates/home.php
===================================================================
--- wp-content/themes/twentytwelve/page-templates/home.php	(revision 0)
+++ wp-content/themes/twentytwelve/page-templates/home.php	(working copy)
@@ -1,7 +1,9 @@
 <?php
 /**
- * Template Name: Homepage
+ * Template Name: Homepage Template
  *
+ * @todo Better documentation here.
+ *
  * @package WordPress
  * @subpackage Twenty_Twelve
  * @since Twenty Twelve 1.0
Index: wp-content/themes/twentytwelve/homepage.php
===================================================================
--- wp-content/themes/twentytwelve/homepage.php	(revision 21641)
+++ wp-content/themes/twentytwelve/homepage.php	(working copy)
@@ -1,30 +0,0 @@
-<?php
-/**
- * Template Name: Homepage
- *
- * @package WordPress
- * @subpackage Twenty_Twelve
- * @since Twenty Twelve 1.0
- */
-
-get_header(); ?>
-
-	<div id="primary" class="site-content">
-		<div id="content" role="main">
-
-			<?php while ( have_posts() ) : the_post(); ?>
-				<?php if ( has_post_thumbnail() ) : ?>
-					<div class="entry-page-image">
-						<?php the_post_thumbnail(); ?>
-					</div><!-- .entry-page-image -->
-				<?php endif; ?>
-
-				<?php get_template_part( 'content', 'page' ); ?>
-
-			<?php endwhile; // end of the loop. ?>
-
-		</div><!-- #content -->
-	</div><!-- #primary -->
-
-<?php get_sidebar( 'home' ); ?>
-<?php get_footer(); ?>
\ No newline at end of file