Index: wp-content/themes/twentytwelve/functions.php
===================================================================
--- wp-content/themes/twentytwelve/functions.php	(revision 21615)
+++ wp-content/themes/twentytwelve/functions.php	(working copy)
@@ -368,7 +368,7 @@
 function twentytwelve_body_class( $classes ) {
 	$background_color = get_background_color();
 
-	if ( ! is_active_sidebar( 'sidebar-1' ) || is_page_template( 'full-width-page.php' ) )
+	if ( ! is_active_sidebar( 1 ) || is_page_template( 'full-width-page.php' ) )
 		$classes[] = 'full-width';
 
 	if ( is_page_template( 'homepage.php' ) && has_post_thumbnail() )
@@ -390,7 +390,7 @@
  * @since Twenty Twelve 1.0
  */
 function twentytwelve_content_width() {
-	if ( is_page_template( 'full-width-page.php' ) || is_attachment() || ! is_active_sidebar( 'sidebar-1' ) ) {
+	if ( is_page_template( 'full-width-page.php' ) || is_attachment() || ! is_active_sidebar( 1 ) ) {
 		global $content_width;
 		$content_width = 960;
 	}
Index: wp-content/themes/twentytwelve/sidebar.php
===================================================================
--- wp-content/themes/twentytwelve/sidebar.php	(revision 21615)
+++ wp-content/themes/twentytwelve/sidebar.php	(working copy)
@@ -8,10 +8,9 @@
  * @subpackage Twenty_Twelve
  * @since Twenty Twelve 1.0
  */
-?>
 
-	<?php if ( is_active_sidebar( 'sidebar-1' ) ) : ?>
-		<div id="secondary" class="widget-area" role="complementary">
-			<?php dynamic_sidebar( 'sidebar-1' ); ?>
-		</div><!-- #secondary .widget-area -->
-	<?php endif; ?>
\ No newline at end of file
+if ( is_active_sidebar( 1 ) ) : ?>
+	<div id="secondary" class="widget-area" role="complementary">
+		<?php dynamic_sidebar( 1 ); ?>
+	</div><!-- #secondary .widget-area -->
+<?php endif; ?>
Index: wp-content/themes/twentytwelve/sidebar-home.php
===================================================================
--- wp-content/themes/twentytwelve/sidebar-home.php	(revision 21615)
+++ wp-content/themes/twentytwelve/sidebar-home.php	(working copy)
@@ -10,11 +10,11 @@
  */
 
 /*
-The homepage widget area is triggered if any of the areas
-have widgets. So let's check that first.
-
-If none of the sidebars have widgets, then let's bail early.
-*/
+ * The homepage widget area is triggered if any of the areas
+ * have widgets. So let's check that first.
+ * 
+ * If none of the sidebars have widgets, then let's bail early.
+ */
 if ( ! is_active_sidebar( 2 ) && ! is_active_sidebar( 3 ) )
 	return;
 
@@ -23,13 +23,13 @@
 <div id="secondary" <?php twentytwelve_homepage_sidebar_class(); ?> role="complementary">
 	<?php if ( is_active_sidebar( 2 ) ) : ?>
 	<div class="first home-widgets">
-		<?php dynamic_sidebar( 'sidebar-2' ); ?>
+		<?php dynamic_sidebar( 2 ); ?>
 	</div><!-- .first .home-widgets -->
 	<?php endif; ?>
 
 	<?php if ( is_active_sidebar( 3 ) ) : ?>
 	<div class="second home-widgets">
-		<?php dynamic_sidebar( 'sidebar-3' ); ?>
+		<?php dynamic_sidebar( 3 ); ?>
 	</div><!-- .second .home-widgets -->
 	<?php endif; ?>
 </div><!-- #secondary .widget-area -->
\ No newline at end of file